summaryrefslogtreecommitdiff
path: root/include/optionstr.h
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2012-12-19 13:39:19 +0000
committerJon TURNEY <jon.turney@dronecode.org.uk>2012-12-19 13:39:19 +0000
commit76049abac505761266f42a53e70f910d3a18063b (patch)
tree774179ad9e45022ab820260a08b5126f444b0e42 /include/optionstr.h
parent300976718089800703c8df49e18dde1e49c23d6a (diff)
parentec9d7ae80e3cb68bbc58339172f9bae795ff345d (diff)
Merge branch 'cygwin-patches-for-1.13' into cygwin-release-1.13xserver-cygwin-1.13.1-1
Conflicts: hw/xwin/Makefile.am
Diffstat (limited to 'include/optionstr.h')
0 files changed, 0 insertions, 0 deletions