Commit Graph

5 Commits

Author SHA1 Message Date
Isaac Connor 73dbe81064 update to 1.26.5 2013-12-13 13:45:55 -05: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