1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-08-13 17:03:46 -04:00
pacman/src
Dan McGee 4ca6590af5 Merge branch 'maint'
Conflicts:
	lib/libalpm/signing.c
	lib/libalpm/sync.c
2012-04-07 11:23:55 -05:00
..
pacman Merge branch 'maint' 2012-04-07 11:23:55 -05:00
util Merge branch 'maint' 2012-02-13 10:14:06 -06:00