Merge branch 'upstream'
authorSimon Schubert <simon.schubert@epfl.ch>
Thu, 26 Feb 2009 20:01:48 +0000 (21:01 +0100)
committerSimon Schubert <simon.schubert@epfl.ch>
Mon, 2 Mar 2009 16:08:53 +0000 (17:08 +0100)
commit358ed6b0de2efdac45739971c72289ba5c8ee899
tree9ac63a3a2e984b04be08583f34efcf5b95899e12
parentf2c3350be23795cb99aeb3124d6b6887f6198208
parent05d5f840eb74c8415e2fe625cea7a786aaca6172
Merge branch 'upstream'

merge and port to DragonFly

Conflicts:
src/Makefile
src/nv-freebsd.h
src/nvidia_ctl.c
src/nvidia_os.c
src/nvidia_subr.c
obj/libGLcore.so.1
src/Makefile
src/cpuopsys.h
src/nv-freebsd.h
src/nvidia_ctl.c
src/nvidia_os.c
src/nvidia_pci.c
src/nvidia_subr.c