Commit Graph

6 Commits

Author SHA1 Message Date
Isaac Connor f0437c6ce4 sync to ubuntu version 2014-08-01 13:53:59 -04:00
Dmitry Katsubo 7bf0bcf4ef Updated package version (otherwise build process stops). 2013-12-30 15:31:50 +01:00
Isaac Connor 80d97c7bdf Merge branch 'master' of https://github.com/FoundationUniversity/ZoneMinder into FoundationUniversity-master
Conflicts:
	distros/debian/changelog
2013-10-03 11:36:26 -04:00
Jan Dennis Bungart a3519feffc Fixing postinst script and changelog needed for successful debian build 2013-09-22 10:01:30 +08:00
Isaac Connor b08a8252c4 Merge branch 'dukess-master' into v1.26.4-beta
Conflicts:
	scripts/zmupdate.pl.in
2013-09-18 13:03:54 -04:00
Isaac Connor eba8b0dde0 move this into the distros dir 2013-09-18 12:51:10 -04:00