| commit | a35610beba1b12c37ec26ec878d3701dd669db42 | |
| author | Dan McGee <dan@archlinux.org> | |
| Mon, 13 Dec 2010 01:53:20 +0000 (12 19:53 -0600) | ||
| committer | Dan McGee <dan@archlinux.org> | |
| Mon, 13 Dec 2010 01:53:20 +0000 (12 19:53 -0600) | ||
| tree | 62928bff67d6f63166da6a7736ab958f54297179 | treesnapshot (tar.gz zip) |
| parent | 4fb3cfc48f626f84329c78351d6a8710255a35e3 | commitdiff |
| parent | 5c8083baa4a831b16adcc3c1c35d7438f5bdcc3e | commitdiff |
Merge branch 'maint'
Conflicts:
lib/libalpm/be_local.c
lib/libalpm/trans.c
Conflicts:
lib/libalpm/be_local.c
lib/libalpm/trans.c
| contrib/PKGBUILD.vim | diff1 | diff2 | blobhistory |
| lib/libalpm/trans.c | diff1 | diff2 | blobhistory |