Skip to content

Commit f00372e

Browse files
committed
Merge branch 'release-1.26'
2 parents 4d508d8 + a4c399a commit f00372e

File tree

286 files changed

+62400
-34685
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

286 files changed

+62400
-34685
lines changed

AUTHORS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ This project was imagined and created by Philip Coombes in
44
September 2002, shortly after being burglarised of his power tools.
55

66
mailto:philip.coombes@zoneminder.com
7+
8+
Plugin architecture and sample plugin modified for this version of ZoneMinder
9+
with support of Stagecoach Wireless (mailto:beat.naef@stagecoach-wireless.com)
10+
and the contributions of the CVisionLab team <info@cvisionlab.com>

ChangeLog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Please see README file.
1+
This is too hard to maintain. See https://github.com/ZoneMinder/ZoneMinder/commits/master

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AUTOMAKE_OPTIONS = gnu
1+
AUTOMAKE_OPTIONS = foreign
22

33
# And these to the user and group of your webserver
44
webuser = @WEB_USER@

0 commit comments

Comments
 (0)