SteveGilvarry 4245928b35 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: src/CMakeLists.txt src/zm_monitor.cpp web/skins/classic/js/skin.js		2014-10-12 20:10:36 +11:00
..
classic	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2014-10-12 20:10:36 +11:00
flat	Merge pull request #371 from m-bene/resizeWindows	2014-10-09 14:46:46 -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