From ac30eb2c1e452df5c4e4992038b24b26cfcd5ced Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Sun, 15 Oct 2006 23:54:43 +0000 Subject: Applied Frugalware patch from Christian Hamar alias krix for file-conflict progress bar Also did some CVS cleanup, removing some of the autogenerated files that shouldn't have been there --- lib/libalpm/conflict.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/libalpm/conflict.h') diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 7b8c9643..5c40af27 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -33,7 +33,7 @@ typedef struct __pmconflict_t { } pmconflict_t; PMList *_alpm_checkconflicts(pmdb_t *db, PMList *packages); -PMList *_alpm_db_find_conflicts(pmdb_t *db, PMList *targets, char *root, PMList **skip_list); +PMList *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root, PMList **skip_list); #endif /* _ALPM_CONFLICT_H */ -- cgit v1.2.3-24-g4f1b