Merge branch 'glsl2'
-rw-r--r-- 291 .emacs-dirvars
-rw-r--r-- 51 .gitattributes
-rw-r--r-- 213 .gitignore
-rw-r--r-- 14005 Makefile
-rw-r--r-- 5310 SConstruct
-rw-r--r-- 4186 acinclude.m4
-rwxr-xr-x 295 autogen.sh
drwxr-xr-x - bin
-rw-r--r-- 2707 common.py
drwxr-xr-x - configs
-rw-r--r-- 49448 configure.ac
drwxr-xr-x - docs
drwxr-xr-x - doxygen
drwxr-xr-x - include
drwxr-xr-x - scons
drwxr-xr-x - src
drwxr-xr-x - windows