summaryrefslogtreecommitdiffstats
path: root/ChangeLog.proto
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-04-16 01:41:49 +0200
committerDan McGee <dan@archlinux.org>2011-04-16 01:41:49 +0200
commitefd8ae483fe587feccd32c90fbee474aa19a5557 (patch)
tree02dfc2f4597d69dcaa18050b604f5c1df5450cd4 /ChangeLog.proto
parent202ade1398ca57070e56de24c3639f3048ecd784 (diff)
parent21a881ec6875dccf42bd602496fa93c5a61f2640 (diff)
downloadpacman-efd8ae483fe587feccd32c90fbee474aa19a5557.tar.gz
pacman-efd8ae483fe587feccd32c90fbee474aa19a5557.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/alpm.h lib/libalpm/trans.c Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'ChangeLog.proto')
0 files changed, 0 insertions, 0 deletions