summaryrefslogtreecommitdiff
path: root/git-union-merge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-12-07 14:40:48 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-12-07 14:40:48 -0400
commit0aa17969582a45d7d28967f45ed9eb2c80560856 (patch)
tree69dcf2058fa119427cc408c5accc06887a184e48 /git-union-merge.hs
parent6a2f9fc2bc34c8ec229c44db8ee7c06f1709c161 (diff)
Revert "skip frameworks"
This reverts commit 206451dd02b4deea8b1cba9309883bef4cfbbc89. At least CoreFoundation framework seems to be needed.
Diffstat (limited to 'git-union-merge.hs')
0 files changed, 0 insertions, 0 deletions