diff options
| author | Judd Vinet <judd@archlinux.org> | 2005-10-08 01:29:49 +0200 |
|---|---|---|
| committer | Judd Vinet <judd@archlinux.org> | 2005-10-08 01:29:49 +0200 |
| commit | 5ef51b3e266cf43411947248886372001fdb207a (patch) | |
| tree | 8d255349530045686053faacd1804502a96b269c /lib/libalpm/conflict.h | |
| parent | 79031ccd1a544475162facb8ca3d671f3464d1f8 (diff) | |
| download | pacman-5ef51b3e266cf43411947248886372001fdb207a.tar.gz pacman-5ef51b3e266cf43411947248886372001fdb207a.tar.xz | |
Merging in recent fixes/additions from 2.9.7
Diffstat (limited to 'lib/libalpm/conflict.h')
| -rw-r--r-- | lib/libalpm/conflict.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h index 133d714d..83bf55ca 100644 --- a/lib/libalpm/conflict.h +++ b/lib/libalpm/conflict.h @@ -23,7 +23,7 @@ #include "db.h" -PMList *db_find_conflicts(pmdb_t *db, PMList *targets, char *root); +PMList *db_find_conflicts(pmdb_t *db, PMList *targets, char *root, PMList **skip_list); #endif /* _ALPM_CONFLICT_H */ |