SteveGilvarry 4d7ded5ef0 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: configure.ac src/Makefile.am web/js/Makefile.am		2016-04-05 22:06:14 +10:00
..
views	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2016-04-05 22:06:14 +10:00
control.css	fix .upBtn and .downBtn also for "flat" css	2015-02-25 18:10:40 +02:00
export.css	Fixed missing semicolons	2016-01-22 13:31:02 -06:00
skin.css	Merge pull request #1247 from bodegard/master	2016-02-04 11:54:02 -05:00