SteveGilvarry
|
20c295ad0c
|
Merge remote-tracking branch 'upstream/master' into feature-plugins
Conflicts:
.travis.yml
CMakeLists.txt
Makefile.am
bootstrap.sh
configure.ac
distros/debian8/control
distros/debian_cmake/control
misc/Makefile.am
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
src/CMakeLists.txt
src/Makefile.am
src/zm_monitor.cpp
src/zm_monitor.h
src/zmstreamer.cpp
web/lang/ru_ru.php
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
|
2016-04-07 00:00:38 +10:00 |
|
SteveGilvarry
|
0277a66700
|
Remove eyezm from distros and Cmake.
Conflicts:
distros/debian8/control
|
2016-02-26 22:41:27 +11:00 |
Emmanuel Papin
|
872fead1fa
|
Rename zoneminder library
|
2015-05-30 14:11:42 +02:00 |
|
Emmanuel Papin
|
746deece73
|
Rename some files, remove links to unused libraries on binaries and some cleanup
|
2015-05-29 22:26:11 +02:00 |
|
Emmanuel Papin
|
5283369ed6
|
Reintroduce modif after upstream merge
|
2015-05-06 01:03:36 +02:00 |
|
Emmanuel Papin
|
630c8f335f
|
Merge master
|
2015-05-05 23:37:20 +02:00 |
|
Emmanuel Papin
|
a4985fb00d
|
Ignore Makefile.old
|
2015-03-15 16:46:48 +01:00 |
|
Emmanuel Papin
|
0f10e2b24d
|
Add config.h.in~ to the list of files to ignore
|
2015-03-14 23:23:21 +01:00 |
|
Emmanuel Papin
|
8a1d00dfd6
|
Ignore file added at compile time
|
2015-03-14 23:15:56 +01:00 |
|
Emmanuel Papin
|
e219b5c86a
|
Ignore files modified at compile time
|
2015-03-14 23:14:27 +01:00 |
|
manupap1
|
6d083fef10
|
Add libzmplugins.pc to .gitignore
|
2014-11-12 00:12:51 +01:00 |
|
manupap1
|
f4bdee108f
|
Add more files to .gitignore
|
2014-11-11 23:55:23 +01:00 |
|
manupap1
|
0d430b5f4f
|
Add new files to .gitignore
|
2014-11-11 21:47:42 +01:00 |
Kyle Johnson
|
39ac8c8b34
|
git ignore files created during bootstrap, configure and make.
|
2014-10-31 12:31:40 -04:00 |
Isaac Connor
|
8942e2367c
|
add Makefile to ignores
|
2014-07-14 13:29:21 -04:00 |
|
Kyle Johnson
|
643e1aac3b
|
Added docs/_build to .gitignore
|
2014-04-25 18:44:49 +00:00 |
Isaac Connor
|
ab1314f250
|
clean out autogenerated files
|
2013-09-12 14:43:57 -04:00 |