summaryrefslogtreecommitdiff
path: root/propellor.cabal
diff options
context:
space:
mode:
authorJoey Hess2016-03-07 21:39:29 -0400
committerJoey Hess2016-03-07 21:39:55 -0400
commit3269dd8ffd621fa977cb108e0e6ad2671a7b6836 (patch)
tree70e686ef46056984f27c0eccc9551253f08b3a46 /propellor.cabal
parentc98285d957865aadaac3190543be1a1b3ae16476 (diff)
parent3137c266b0082cf33d0cf747b2a2ea0929ca2d92 (diff)
Merge branch 'master' into wip
Diffstat (limited to 'propellor.cabal')
-rw-r--r--propellor.cabal3
1 files changed, 2 insertions, 1 deletions
diff --git a/propellor.cabal b/propellor.cabal
index b683b144..4e0e1db2 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -17,8 +17,9 @@ Extra-Source-Files:
Makefile
config-simple.hs
config-freebsd.hs
- config-joey.hs
+ joeyconfig.hs
config.hs
+ contrib/post-checkout-hook
debian/changelog
debian/README.Debian
debian/compat