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
..
css	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2016-04-05 22:06:14 +10:00
graphics	Removed Autotools Makefile.am	2016-02-26 22:19:02 +11:00
includes	Removed Autotools Makefile.am	2016-02-26 22:19:02 +11:00
js	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	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
skin.php	Imported missing files from master to feature-h264-videostorage	2014-05-30 01:47:52 +10:00