woutervanwijk
|
99b3706422
|
Merge branch 'develop'
Conflicts:
flatclient/css/webclient.css
flatclient/index.html
flatclient/js/controls.js
flatclient/js/functionsvars.js
flatclient/js/gui.js
flatclient/js/library.js
|
2013-12-28 15:40:48 +01:00 |
|
woutervanwijk
|
a3d4cddcb1
|
bugfix for safari, searchresults
|
2013-12-02 12:32:17 +01:00 |
|
woutervanwijk
|
43d80e9a77
|
Merge branch 'master' into develop
Conflicts:
webclient/js/functionsvars.js
|
2013-11-12 20:54:53 +01:00 |
|
woutervanwijk
|
0a34a845c6
|
swipe ok, independent scrolling playlists in flatui
|
2013-11-12 20:52:38 +01:00 |
|
woutervanwijk
|
029e5d44fa
|
bugfixes, better swipes
|
2013-11-12 01:17:34 +01:00 |
|
woutervanwijk
|
63e0dda387
|
included alternative flatclient from ulilicht, with updates from me
|
2013-11-11 13:36:04 +01:00 |
|