merge branch touch
authorSuperBFG7 <daniel@despite.ch>
Thu, 22 Oct 2015 15:49:42 +0000 (17:49 +0200)
committerSuperBFG7 <daniel@despite.ch>
Thu, 22 Oct 2015 15:49:42 +0000 (17:49 +0200)
commitb59c06b9222d78f4eeeb9d4d1ea9ae6c195e4482
tree92f205189f8328745174d9046cf89c3911e7ac78
parenta8bcba7fe7346a0452105d0ca78e0b68861adbec
parent2e74427778ed32aa6548967c7489a26d5fc15965
merge branch touch
htdocs/index.html
htdocs/js/mpd.js