diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-10 14:38:39 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-10 14:38:39 +0100 |
| commit | 2ea5d49da27c3569251896884786649a72bd6df3 (patch) | |
| tree | e9b6f96bdd1135b555437c6583d42b450cf2f1fc /include/libmsi-database.h | |
| parent | 3fd04bf98a826f766f8a656c262b89cba38db284 (diff) | |
| parent | ada3b04b2246c13449e6b32b3857d7b86a8958f8 (diff) | |
Merge branch 'pre-gsf' into HEAD
Conflicts:
libmsi/msiquery.c
Diffstat (limited to 'include/libmsi-database.h')
0 files changed, 0 insertions, 0 deletions