updated x11
Merge branch 'x11' of https://github.com/aatkin/GLTest into x11