Applied Frugalware patch from Christian Hamar alias krix <krics@linuxforum.hu>

for file-conflict progress bar
Also did some CVS cleanup, removing some of the autogenerated files that
shouldn't have been there

1 files changed, 1 insertions, 1 deletions

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 */