summaryrefslogtreecommitdiff
path: root/lib/libalpm/conflict.h
AgeCommit message (Collapse)Author
2006-10-20A handful of minor changes:Aaron Griffin
* Removed the PMList typedef, in favor of the same naming scheme other structs use 'pmlist_t' * Added a time stamp on debug output, to make it more informational * Moved alpm_db_register to _alpm_db_register, making the public function not take a callback parameter
2006-10-15Applied Frugalware patch from Christian Hamar alias krix <krics@linuxforum.hu>Aaron Griffin
for file-conflict progress bar Also did some CVS cleanup, removing some of the autogenerated files that shouldn't have been there
2006-02-17prepend library function names with _alpm (helped with the patch from ↵Aurelien Foret
VMiklos <vmiklos@frugalware.org>) added log and event callbacks to sync_commit internal transactions
2006-02-05added a pmconflict_t structure to handle file conflictsAurelien Foret
2006-01-15pulled out conflict checkings from checkdeps() in its own function: ↵Aurelien Foret
checkconflicts()
2006-01-02patch from VMiklos - use PACKAGE_VERSION instead of PACMAN_VERSIONJudd Vinet
2005-10-07Merging in recent fixes/additions from 2.9.7Judd Vinet
2005-03-22moved db_find_conflicts from db.c to conflict.cAurelien Foret