diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-12 10:26:10 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-12 10:26:15 +0100 |
| commit | 79385dd37ad96abe473f957a368c80631307111b (patch) | |
| tree | 27faf56a8efe07bc3132f5b9fe369da016961a0d /.gitignore | |
| parent | a656e3eb1840c0637ab0eb1f5eba24071cc46ba8 (diff) | |
| parent | 382ca48cbcf5941be0d4f412ad4ef6fc1d6136ac (diff) | |
| download | msitools-79385dd37ad96abe473f957a368c80631307111b.tar.gz msitools-79385dd37ad96abe473f957a368c80631307111b.tar.xz msitools-79385dd37ad96abe473f957a368c80631307111b.zip | |
Merge branch 'pre-gsf'
Conflicts:
libmsi/libmsi-record.c
tests/test.h
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions