summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-04-24 08:41:46 -0500
committerDan McGee <dan@archlinux.org>2012-04-24 08:44:11 -0500
commitca4f8687f7816c283ee2b4a438b28deff3a276d4 (patch)
tree17e126e316e422f9610eecbabf39bf1d7d9d0555 /COPYING
parentac6ebcfe93e8214ad4170caab006ffe5f9abe98d (diff)
parent5f71570ec48588bf24bfe786f40b500216084d07 (diff)
Merge branch 'maint'
Conflicts: scripts/repo-add.sh.in
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions