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, 2 insertions, 1 deletions

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 211ec99b..3807b11e 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -308,7 +308,8 @@ enum {
 enum {
 	PM_TRANS_PROGRESS_ADD_START,
 	PM_TRANS_PROGRESS_UPGRADE_START,
-	PM_TRANS_PROGRESS_REMOVE_START
+	PM_TRANS_PROGRESS_REMOVE_START,
+	PM_TRANS_PROGRESS_CONFLICTS_START
 };
 
 /* Transaction Event callback */