summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authormikec <mikec@mikenz.geek.nz>2008-07-21 09:56:37 -0400
committermikec <mikec@mikenz.geek.nz>2008-07-21 09:56:37 -0400
commita4fa34cecbd038fb2cc323aefd2b32739aaee7d5 (patch)
tree040f9ea3ee60f79c814d6732e5360a0dc687428d /COPYING
parentd48609ac51f9f7aa5b57df1e9ab9aa7353721c00 (diff)
Resolve conflicts after pull from evan
darcs-hash:20080721135637-edabd-cca33bc0a0936423b9fd2ffdf9413236123d680e.gz
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions