Merge branch 'master' into spikes/hyperv
authorlysannkessler <lysann.kessler@gmail.com>
Wed, 25 Jul 2012 17:05:10 +0000 (19:05 +0200)
committerlysannkessler <lysann.kessler@gmail.com>
Wed, 25 Jul 2012 17:05:10 +0000 (19:05 +0200)
commit8c2d46a4366ffdd0f0f44943a9b7ba598c53e45e
tree167009af7cfc9c285a61fd62b91492ef6d044460
parentf8430e246cab1cc2d180e29a8e995ebc60ca7860
parent6b754ab8368b4f17b5b20ff92c5841e9c7b8158f
Merge branch 'master' into spikes/hyperv
client/X11/xf_graphics.c