Synchronised glx files
Removed oscolor.c from makefile
Take previsou version of openssl/Configure. From the latest release
xlaunch: increased space so that all text is visible.
remove glsl/lower_discard_flow.cpp and glsl/opt_dead_functions.cpp from
Merge remote-tracking branch 'origin/released'
Merge remote-tracking branch 'origin/released'
Upgraded expat to 2.6.2