Isaac Connor
|
463d8a136f
|
Merge branch 'master' into mysql2PDO
Conflicts:
zm.conf.in
|
2013-11-08 11:22:09 -05:00 |
Kfir Itzhak
|
be21a882ab
|
Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf
Remove ZM_VERSION from zm.conf
|
2013-11-04 12:27:50 -08:00 |
|
Isaac Connor
|
7989e8e980
|
Merge branch 'master' into mysql2PDO
|
2013-11-03 16:07:37 -05:00 |
|
Isaac Connor
|
3fa91a30a3
|
allow the value side of config lines potentially be empty.
|
2013-11-03 15:52:37 -05:00 |
|
Isaac Connor
|
72b80d7417
|
remake this branch off master instead of off mysql2PDO.
Establish an automake substitution of @VERSION@ and use it throughotu to override whatever is in zm.conf
|
2013-11-01 09:47:28 -04:00 |
|
Isaac Connor
|
09fbdc9e35
|
forget the updates to this file
|
2013-10-17 16:57:05 -04:00 |
stan
|
6ff385e407
|
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-06-21 09:19:10 +00:00 |
|
stan
|
8048c1c355
|
Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-02-15 21:59:06 +00:00 |
|
stan
|
f06b6cf60b
|
Added in define for prescence/abscence of libpcre
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2692 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-12-05 18:41:14 +00:00 |
|
stan
|
6d78b17d90
|
Added CMD_VARPLAY to stream commands
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2687 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-11-03 13:16:47 +00:00 |
|
stan
|
b7f97d388f
|
Added configuraion and detection of V4L2 to web interface.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2678 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-10-28 14:25:12 +00:00 |
|
stan
|
1080485c33
|
Motage and event list issues, fixes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2642 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-09-30 15:29:14 +00:00 |
|
stan
|
323338b661
|
Applied Corey patch.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2640 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-09-29 13:15:13 +00:00 |
|
stan
|
106882c161
|
Updated copyright notices
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-07-25 09:48:16 +00:00 |
|
stan
|
81065ba6dd
|
Removed learn state bits
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2510 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-07-14 14:42:20 +00:00 |
|
stan
|
2824cb7355
|
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2008-07-14 13:54:50 +00:00 |