summaryrefslogtreecommitdiff
path: root/propellor.cabal
diff options
context:
space:
mode:
authorJoey Hess2014-08-19 17:30:34 -0400
committerJoey Hess2014-08-19 17:30:34 -0400
commit5160041df9dbaa69d40e792bac896d3f4da1d14f (patch)
treea4fbee644c8dba56d6810ba2cb7b961be5b6c387 /propellor.cabal
parenteff0fe5dffaf387771042f8584501219d98bbbf2 (diff)
parent4766442124483e6c0965f02e6a2f19ce0cb962be (diff)
Merge branch 'joeyconfig'
Conflicts: Makefile
Diffstat (limited to 'propellor.cabal')
0 files changed, 0 insertions, 0 deletions