Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c
Remove glutInitWindowPosition() calls to play nicer with window managers. Move glutInitWindowSize() calls before glutInit() so the the default window size can be overridden by the -geometry cmd line option.