SteveGilvarry bf33eab17c Merge branch 'video' into feature-h264-videostorage ... Conflicts: src/CMakeLists.txt src/Makefile.am src/zm_event.cpp web/skins/classic/views/js/event.js		2014-12-02 20:58:35 +11:00
..
classic	Merge branch 'video' into feature-h264-videostorage	2014-12-02 20:58:35 +11:00
flat	don't require SystemView to view/select groups.	2014-11-13 10:38:20 -05:00
mobile	Imported missing files from master to feature-h264-videostorage	2014-05-30 01:47:52 +10:00
xml	Merge pull request #359 from knnniggett/eyezm	2014-07-07 17:57:48 -05:00
Makefile.am	Imported missing files from master to feature-h264-videostorage	2014-05-30 01:47:52 +10:00