summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/server.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-05-12 03:14:30 +0200
committerDan McGee <dan@archlinux.org>2008-05-12 03:14:30 +0200
commit663408532ae852e7123da6b9658df1cacc0c642d (patch)
tree1ceb0e1d276350fdde4cd0542ad7ff815f5c0e83 /lib/libalpm/server.c
parent13f24a5bdabf9c2c7bfa07aff7176495bb775a0d (diff)
parente3d35b3274f13cc9ed8d79fa873d6348e424259e (diff)
downloadpacman-663408532ae852e7123da6b9658df1cacc0c642d.tar.gz
pacman-663408532ae852e7123da6b9658df1cacc0c642d.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/package.c - comment location moved to be_package.c
Diffstat (limited to 'lib/libalpm/server.c')
0 files changed, 0 insertions, 0 deletions