diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-10 11:49:54 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-10 11:49:54 +0200 |
| commit | 6231dd66fec697922b164ec03731f04542c2b30e (patch) | |
| tree | 83bfa2dec8ba2d32860d513b7816dae412712fa5 /xorg-server/hw/xwin/xlaunch/resources/strings.rc | |
| parent | 58780b4306bd1254c6c0e65d255630d5c546005f (diff) | |
| parent | 13a63d4f69c0692539448cb3d8e4a0e1ffdf2183 (diff) | |
| download | vcxsrv-6231dd66fec697922b164ec03731f04542c2b30e.tar.gz vcxsrv-6231dd66fec697922b164ec03731f04542c2b30e.tar.bz2 vcxsrv-6231dd66fec697922b164ec03731f04542c2b30e.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/os/log.c
Diffstat (limited to 'xorg-server/hw/xwin/xlaunch/resources/strings.rc')
0 files changed, 0 insertions, 0 deletions