summaryrefslogtreecommitdiff
path: root/lib/libalpm/conflict.h
Commit message (Collapse)AuthorAge
* A handful of minor changes:Aaron Griffin2006-10-20
| | | | | | | | * 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
* Applied Frugalware patch from Christian Hamar alias krix <krics@linuxforum.hu>Aaron Griffin2006-10-15
| | | | | | for file-conflict progress bar Also did some CVS cleanup, removing some of the autogenerated files that shouldn't have been there
* prepend library function names with _alpm (helped with the patch from ↵Aurelien Foret2006-02-17
| | | | | | VMiklos <vmiklos@frugalware.org>) added log and event callbacks to sync_commit internal transactions
* added a pmconflict_t structure to handle file conflictsAurelien Foret2006-02-05
|
* pulled out conflict checkings from checkdeps() in its own function: ↵Aurelien Foret2006-01-15
| | | | checkconflicts()
* patch from VMiklos - use PACKAGE_VERSION instead of PACMAN_VERSIONJudd Vinet2006-01-02
|
* Merging in recent fixes/additions from 2.9.7Judd Vinet2005-10-07
|
* moved db_find_conflicts from db.c to conflict.cAurelien Foret2005-03-22