diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-10 14:01:02 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-10 14:01:02 +0100 |
| commit | 3bafbe496107b4a74790fb79b22d986c864bb460 (patch) | |
| tree | 88fffbc370f15720117f404cb29314bb9aa692d7 /include | |
| parent | e64ed93d4859a1b95b40e70256fff5945500d78d (diff) | |
| parent | 7c218b82e38738f17fef56b660f256fa6e9ede1f (diff) | |
Merge branch 'pre-gsf' into HEAD
Conflicts:
libmsi/msipriv.h
libmsi/record.c
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions