SteveGilvarry
|
9b06b1399c
|
Merge branch 'master' into feature-h264-videostorage
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
src/zm_ffmpeg_camera.cpp
web/skins/classic/views/event.php
web/skins/classic/views/monitor.php
web/skins/classic/views/timeline.php
|
2015-06-10 23:09:30 +10:00 |
Dmitry Smirnov
|
b0909a4c57
|
autouse Data::Dumper
|
2015-04-16 15:48:51 +10:00 |
|
Dmitry Smirnov
|
7ba03132fc
|
zmvideo.pl: pod2usage + readability
|
2015-04-16 15:48:48 +10:00 |
|
SteveGilvarry
|
79c82ea880
|
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
|
2015-02-17 23:16:42 +11:00 |
Isaac Connor
|
7f934e0e69
|
Add version to the usage line in zmvideo.pl
|
2015-01-07 09:11:07 -05:00 |
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 |
|
Isaac Connor
|
48a6dcf5ce
|
Change COnfig from using the subroutine symbol table to just using a global hash
|
2013-12-16 16:32:02 -05:00 |
Kyle Johnson
|
5f4ff5c7cf
|
Return the full path to the generated video
|
2013-09-19 09:53:20 -04:00 |
stan
|
5c2149e319
|
Fixed incorrectly quoted patterns to split
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3504 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2011-08-25 20:45:32 +00: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
|
11a1cc2d41
|
Now supports custom perl install path
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
|
2009-06-08 09:11:56 +00:00 |