Isaac Connor 7cf5475542 Merge ../ZoneMinder-kfir into kfir-proper ...

Conflicts:
	configure
	src/Makefile.am
	src/Makefile.in

2013-05-02 21:28:51 -04:00

..

actions.php

1) Added image size requirements to ensure proper alignment

2012-02-01 07:33:20 +02:00

config.php.in

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f

2011-06-21 09:19:10 +00:00

control_functions.php

Further PTZ preset tweaks

2009-09-28 14:16:17 +00:00

database.php

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f

2011-06-21 09:19:10 +00:00

functions.php

Tidier detainting.

2011-08-03 17:33:58 +00:00

lang.php

Updated copyright notices

2008-07-25 09:48:16 +00:00

logger.php

Fixed environment fetching when in cli mode and logfile error message.

2011-06-27 16:15:59 +00:00

Makefile.am

Fixed distribution and install lists

2011-08-05 11:24:24 +00:00

Makefile.in

Recreated generated files.

2012-07-04 09:46:18 +00:00