summaryrefslogtreecommitdiff
path: root/git-union-merge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-23 20:24:23 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-23 20:24:23 -0400
commit0db413d7771b4840a007cad56348f89fe1b80644 (patch)
tree91d129049ab90dac9debe1be85423c009bc483c6 /git-union-merge.hs
parent38488f56da25221e66b3ad306906c5ff7f74c62b (diff)
added network-protocol-xmpp and -DWITH_XMPP
Diffstat (limited to 'git-union-merge.hs')
0 files changed, 0 insertions, 0 deletions