ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
zoneminder/docs
History
Isaac Connor 16953c6e2b Merge branch 'storageareas' into thumbnail_on_console 
Conflicts:
	db/zm_update-1.29.1.sql
	docs/installationguide/index.rst
	src/Makefile.am
	src/zm_event.cpp
	src/zm_event.h
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_zone.cpp
	src/zmf.cpp
	web/skins/classic/views/console.php
	web/skins/classic/views/monitor.php
 		2016-05-02 17:41:14 -04:00
..
_static custom theming for ZM 2015-12-19 16:53:47 -05:00
_templates Initial attempt to migrate wiki to readthedocs 2014-07-13 22:25:30 +10:00
installationguide Merge branch 'storageareas' into thumbnail_on_console 2016-05-02 17:41:14 -04:00
userguide updated documentation to include runstates 2016-04-13 12:54:22 -04:00
Makefile Initial commit of Sphinx docs directory 2014-04-25 18:33:41 +00:00
README.md Added a README to the docs dir 2014-04-30 03:30:31 +00:00
api.rst merge master 2015-09-24 10:01:27 -04:00
conf.py don't use sphinx 2016-01-05 15:36:44 -05:00
contributing.rst Made content same as github README.md contributing 2015-08-16 14:49:44 -04:00
faq.rst updated documentation to include runstates 2016-04-13 12:54:22 -04:00
index.rst codespell: misc. spelling corrections 2016-02-08 20:41:36 +11:00

README.md

The latest version of these docs can be found at http://zoneminder.readthedocs.org/