Viewing all changes in revision 957.
- Committer: Victor Thompson
- Date: 2015-12-08 02:30:29 UTC
- mfrom: (952.1.2 music-app)
- Revision ID: victor.thompson@gmail.com-20151208023029-1eh3595nw37pquxv
Merge of trunk and resolve conflicts
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
