summaryrefslogtreecommitdiffstats
path: root/HACKING
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-12-13 02:53:20 +0100
committerDan McGee <dan@archlinux.org>2010-12-13 02:53:20 +0100
commita35610beba1b12c37ec26ec878d3701dd669db42 (patch)
tree62928bff67d6f63166da6a7736ab958f54297179 /HACKING
parent4fb3cfc48f626f84329c78351d6a8710255a35e3 (diff)
parent5c8083baa4a831b16adcc3c1c35d7438f5bdcc3e (diff)
downloadpacman-a35610beba1b12c37ec26ec878d3701dd669db42.tar.gz
pacman-a35610beba1b12c37ec26ec878d3701dd669db42.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/be_local.c lib/libalpm/trans.c
Diffstat (limited to 'HACKING')
0 files changed, 0 insertions, 0 deletions