summaryrefslogtreecommitdiff
path: root/debian/rules
diff options
context:
space:
mode:
authorJoey Hess2015-03-12 20:09:31 -0400
committerJoey Hess2015-03-12 20:09:31 -0400
commitbc60edb50a41a326e64ccd25a36ac27215ef4b9e (patch)
tree7e3849d123da0dda038d2f5e3d88025635beb444 /debian/rules
parent4f101f8560e29958b08306c86a1b8ca34e8a6a0c (diff)
parent9292cee1aa7967a0afe6d45f58a6d429d1b56b55 (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'debian/rules')
0 files changed, 0 insertions, 0 deletions