Merge branch 'local_play'
authorSuperBFG7 <daniel@despite.ch>
Thu, 22 Oct 2015 09:21:09 +0000 (11:21 +0200)
committerSuperBFG7 <daniel@despite.ch>
Thu, 22 Oct 2015 09:21:09 +0000 (11:21 +0200)
commit8696216d6e1b4993b538df4c7db4b65ab64a4d31
treeeb4804287202268a49780c4d83223091988de4b6
parentff92b2718ff44ebf17bebea8d0ce620699e779ad
parent4643f1cdcb95a0025be6aca66140b6d2f82e8613
Merge branch 'local_play'
CMakeLists.txt
htdocs/index.html
htdocs/js/mpd.js