Judd Vinet 58c9d5d663 applied first try at sync conflict handling (VMiklos) plus a couple changes		2005-12-26 06:40:29 +00:00
..
libalpm	applied first try at sync conflict handling (VMiklos) plus a couple changes	2005-12-26 06:40:29 +00:00
libftp	added first part of the autoconf stuff - patch from Christian Hamar <krics@linuxforum.hu>	2005-10-17 18:52:43 +00:00