projects / ympd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff92b27 4643f1c)
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)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history
htdocs/index.html patch | diff1 | diff2 | blob | history
htdocs/js/mpd.js patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
diff --cc htdocs/index.html
Simple merge
diff --cc htdocs/js/mpd.js
Simple merge
MPD Web GUI - written in C, utilizing Websockets and Bootstrap/JS