SteveGilvarry b79c2c1604 Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch ... Conflicts: web/skins/classic/views/event.php web/skins/classic/views/timeline.php Also reapplied required PHP Short Tags fix to a event.php and monitor.php that got impacted in merge.		2014-12-25 08:24:48 +10:00
..
Control	Some cleanups, remove code that does nothing.	2014-12-08 15:54:27 -05:00
Memory	revert size check for now	2014-08-04 11:26:33 -04:00
Trigger	just update the perldoc parts	2014-11-06 10:02:34 -05: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 remote-tracking branch 'upstream/master' into feature-h264-videostorage	2014-12-02 20:18:24 +11: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	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2014-10-18 15:02:43 +11:00