summaryrefslogtreecommitdiffstats
path: root/contrib/pacsearch.in
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-07-03 21:44:57 +0200
committerDan McGee <dan@archlinux.org>2011-07-03 21:44:57 +0200
commit1ce7f39ad73c5c96870c6036014afad3d49a8edf (patch)
tree616b3259a2a6c4bcad5a5433a02985352c60699d /contrib/pacsearch.in
parentc839415e3fb4bcde11de3cb7595cec93501bed13 (diff)
parentafc96f2ab3d05f14a73e81f871164f01423b5572 (diff)
downloadpacman-1ce7f39ad73c5c96870c6036014afad3d49a8edf.tar.gz
pacman-1ce7f39ad73c5c96870c6036014afad3d49a8edf.tar.xz
Merge remote-tracking branch 'allan/ALPM'
Conflicts: lib/libalpm/be_local.c lib/libalpm/be_package.c lib/libalpm/conflict.c lib/libalpm/diskspace.c lib/libalpm/dload.c lib/libalpm/remove.c
Diffstat (limited to 'contrib/pacsearch.in')
0 files changed, 0 insertions, 0 deletions