Merge branch 'release-1.26'

ZoneMinder · Sep 5, 2013 · f00372e · f00372e
2 parents 4d508d8 + a4c399a
commit f00372e
Show file tree

Hide file tree

Showing 286 changed files with 62,400 additions and 34,685 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -4,3 +4,7 @@ This project was imagined and created by Philip Coombes in
 September 2002, shortly after being burglarised of his power tools.
 
 mailto:[email protected]
+
+Plugin architecture and sample plugin modified for this version of ZoneMinder
+with support of Stagecoach Wireless (mailto:[email protected])
+and the contributions of the CVisionLab team <[email protected]>
diff --git a/ChangeLog b/ChangeLog
@@ -1 +1 @@
-Please see README file.
+This is too hard to maintain.  See https://github.com/ZoneMinder/ZoneMinder/commits/master
diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = gnu
+AUTOMAKE_OPTIONS = foreign
 
 # And these to the user and group of your webserver
 webuser = @WEB_USER@