diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-07-16 15:41:57 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-07-16 15:41:57 +0100 |
| commit | cad2feacb52c7e38236db39df06c3fc11ba3aae1 (patch) | |
| tree | 5f26ea8e5c9977b158adc38320d763824c961644 /hw/xfree86/parser/Module.c | |
| parent | 34bec4d0fef398540485ab81e12646bc20d4695c (diff) | |
| parent | 56574a16d67a6ff1c07cb1504ecbc5cebea3c2fc (diff) | |
Merge branch 'cygwin-patches-for-1.12' into cygwin-release-1.12xserver-cygwin-1.12.3-1
Conflicts:
hw/xwin/winconfig.c
hw/xwin/winconfig.h
Diffstat (limited to 'hw/xfree86/parser/Module.c')
0 files changed, 0 insertions, 0 deletions