summaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-07-03 01:29:37 +0200
committerDan McGee <dan@archlinux.org>2010-07-03 01:29:37 +0200
commit686b8c146398c5ba9feee2c1fa10bf9e598b2ce8 (patch)
tree0353500bc444ac60cef120ea6d722c94badfe8ca /AUTHORS
parent1a9db4cac7cf308188298db48dde5d80ce86a7e9 (diff)
parentfcb4f0264f2b8e0a6ed1e7eebfe00f662ba94ef2 (diff)
downloadpacman-686b8c146398c5ba9feee2c1fa10bf9e598b2ce8.tar.gz
pacman-686b8c146398c5ba9feee2c1fa10bf9e598b2ce8.tar.xz
Merge branch 'maint'
Conflicts: scripts/makepkg.sh.in
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions