Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-08-19 17:00:56 -04:00
commit b938dbbe3c
2 changed files with 3 additions and 3 deletions

4
debian/changelog vendored
View File

@ -1,4 +1,4 @@
propellor (0.8.3) UNRELEASED; urgency=medium propellor (0.8.3) unstable; urgency=medium
* The Debian package now includes a single-revision git repository in * The Debian package now includes a single-revision git repository in
/usr/src/propellor/, and ~/.propellor/ is set up to use this repository as /usr/src/propellor/, and ~/.propellor/ is set up to use this repository as
@ -10,7 +10,7 @@ propellor (0.8.3) UNRELEASED; urgency=medium
* Included the config.hs symlink to config-simple.hs in the cabal and Debian * Included the config.hs symlink to config-simple.hs in the cabal and Debian
packages. packages.
-- Joey Hess <joeyh@debian.org> Tue, 19 Aug 2014 14:16:32 -0400 -- Joey Hess <joeyh@debian.org> Tue, 19 Aug 2014 17:00:39 -0400
propellor (0.8.2) unstable; urgency=medium propellor (0.8.2) unstable; urgency=medium

View File

@ -1,5 +1,5 @@
Name: propellor Name: propellor
Version: 0.8.2 Version: 0.8.3
Cabal-Version: >= 1.6 Cabal-Version: >= 1.6
License: BSD3 License: BSD3
Maintainer: Joey Hess <joey@kitenet.net> Maintainer: Joey Hess <joey@kitenet.net>