diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-10 17:30:32 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-10 17:30:32 +0100 |
| commit | 9a1151d6474ac7daebc263edc2f37caf3b4c9955 (patch) | |
| tree | d11965d58c2eb20c0470fc5f9c25de42ab545375 /Makefile.am | |
| parent | 2ea5d49da27c3569251896884786649a72bd6df3 (diff) | |
| parent | 6b7407cb031cf245a4998d8c79009039ead38fc5 (diff) | |
| download | msitools-9a1151d6474ac7daebc263edc2f37caf3b4c9955.tar.gz msitools-9a1151d6474ac7daebc263edc2f37caf3b4c9955.tar.xz msitools-9a1151d6474ac7daebc263edc2f37caf3b4c9955.zip | |
Merge branch 'pre-gsf'
Conflicts:
libmsi/Makefile.am
libmsi/libmsi-summary-info.c
libmsi/msipriv.h
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions