diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-10-16 01:54:43 +0200 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-10-16 01:54:43 +0200 |
| commit | ac30eb2c1e452df5c4e4992038b24b26cfcd5ced (patch) | |
| tree | 7f64aa644a961c55f6f8e58eb16c2d54e661d81c /lib/libalpm/alpm.h | |
| parent | 04c48b4547e2a0710b0160b43644310f52db25f0 (diff) | |
| download | pacman-ac30eb2c1e452df5c4e4992038b24b26cfcd5ced.tar.gz pacman-ac30eb2c1e452df5c4e4992038b24b26cfcd5ced.tar.xz | |
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
Diffstat (limited to 'lib/libalpm/alpm.h')
| -rw-r--r-- | lib/libalpm/alpm.h | 3 |
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 */ |