stevegilvarry 33090f2264 Merge branch 'master' into feature-h264-videostorage ...

Conflicts:
	configure.ac
	src/zm_config_defines.h
	src/zm_ffmpeg.h
	web/index.php

2014-05-30 01:55:24 +10:00

..

Control

Imported missing files from master to feature-h264-videostorage

2014-05-30 01:47:52 +10:00

Memory

robustness/code style changes

2014-01-03 12:55:30 -05:00

Trigger

Migrate svn to git

2013-03-17 00:45:21 +01:00

Base.pm.in

add in missing @

2013-11-04 09:57:00 -05:00

Config.pm.in

more

2013-12-16 16:36:12 -05:00

ConfigAdmin.pm

Change COnfig from using the subroutine symbol table to just using a global hash

2013-12-16 16:32:02 -05:00

ConfigData.pm.in

Merge branch 'master' into feature-h264-videostorage

2014-05-30 01:55:24 +10:00

Control.pm

Migrate svn to git

2013-03-17 00:45:21 +01:00

Database.pm

Change COnfig from using the subroutine symbol table to just using a global hash

2013-12-16 16:32:02 -05:00

General.pm

Change COnfig from using the subroutine symbol table to just using a global hash

2013-12-16 16:32:02 -05:00

Logger.pm

Change COnfig from using the subroutine symbol table to just using a global hash

2013-12-16 16:32:02 -05:00

Memory.pm.in

Updated event processing to actually add frames into the DB. Use MP4 container

2013-09-14 00:50:54 +12:00