Merge 16964:17122
authorMartin Poirier <theeth@yahoo.com>
Mon, 20 Oct 2008 00:27:33 +0000 (00:27 +0000)
committerMartin Poirier <theeth@yahoo.com>
Mon, 20 Oct 2008 00:27:33 +0000 (00:27 +0000)
commitf1faacd7e105cc815df60848f6ba38deffedae96
tree9163cf25ccb39bb545a82779675cbb9eaa743cdc
parent1e17953d68356c3911d9e09e3539068bb04bfdcb
parent90721f3f835fca7fed7dce99a2b7b447eba50e26
Merge 16964:17122
source/blender/src/header_view3d.c
source/blender/src/space.c
source/blender/src/view.c