Merge branch 'upstream'
authorSimon Schubert <simon.schubert@epfl.ch>
Wed, 9 Sep 2009 17:50:13 +0000 (19:50 +0200)
committerSimon Schubert <simon.schubert@epfl.ch>
Wed, 9 Sep 2009 17:50:46 +0000 (19:50 +0200)
commit071e83515b1651630897b8d5f165d5307a302a50
tree987471aed599e57386164578da258e484be8ac23
parent7b05b7ced0a7d3cf5d0ee68ff4b79161be47d435
parent5b34fd865b9624a0ff7d34a2b51ec0e74323019a
Merge branch 'upstream'

Conflicts:
obj/libGLcore.so.1
src/Makefile
src/nv-freebsd.h
lib/Makefile
src/Makefile
src/nv-freebsd.h
src/nvidia_os.c