[tuhopuu-cvs] CVS commit: tuhopuu2 Makefile.am bootstrap configure.ac depcomp install-sh ltmain.sh missing mkinstalldirs tuhopuu2/bin/.blender .Blanguages tuhopuu2/extern/qhull Announce.txt COPYING.txt FILE_ID.DIZ README.txt REGISTER.txt tuhopuu2/extern/qhull/VisualC6 ...
Chris Want
cwant at ualberta.ca
Sat Mar 6 18:07:47 CET 2004
hos (Chris Want) 2004/03/06 18:07:47 CET
Modified files:
tuhopuu2/bin/.blender .Blanguages
tuhopuu2/extern/qhull Announce.txt COPYING.txt FILE_ID.DIZ
README.txt REGISTER.txt
tuhopuu2/extern/qhull/VisualC6 qhull.dsw
tuhopuu2/extern/qhull/VisualC6/qhull qhull.dsp
tuhopuu2/extern/qhull/eg Qhull-go.bat q_eg q_egtest q_test
q_test.bat
tuhopuu2/extern/qhull/html index.htm qconvex.htm qdelau_f.htm
qdelaun.htm qh-eg.htm qh-faq.htm
qh-get.htm qh-home.htm qh-impre.htm
qh-in.htm qh-optc.htm qh-optf.htm
qh-optg.htm qh-opto.htm qh-optp.htm
qh-optq.htm qh-optt.htm
qh-quick.htm qhalf.htm qhull.htm
qhull.man qhull.txt qvoron_f.htm
qvoronoi.htm rbox.htm rbox.man
rbox.txt
tuhopuu2/extern/qhull/include/qhull geom.h io.h mem.h merge.h
poly.h qhull.h qhull_a.h
qset.h stat.h user.h
tuhopuu2/extern/qhull/src Changes.txt MBorland Makefile.txt
geom.c geom.h geom2.c global.c
index.htm io.c io.h mem.c mem.h
merge.c merge.h poly.c poly.h
poly2.c qconvex.c qdelaun.c
qh-geom.htm qh-globa.htm qh-io.htm
qh-mem.htm qh-merge.htm qh-poly.htm
qh-qhull.htm qh-set.htm qh-stat.htm
qh-user.htm qhalf.c qhull.c qhull.h
qhull_a.h qhull_interface.cpp qset.c
qset.h qvoronoi.c rbox.c stat.c
stat.h unix.c user.c user.h
user_eg.c user_eg2.c
tuhopuu2/intern/SoundSystem SConscript
tuhopuu2/intern/bmfont SConscript
tuhopuu2/intern/bsp SConscript
tuhopuu2/intern/container SConscript
tuhopuu2/intern/decimation SConscript
tuhopuu2/intern/ghost SConscript
tuhopuu2/intern/ghost/intern GHOST_WindowX11.cpp
tuhopuu2/intern/guardedalloc SConscript
tuhopuu2/intern/iksolver SConscript
tuhopuu2/intern/memutil SConscript
tuhopuu2/intern/moto SConscript
tuhopuu2/intern/string SConscript
tuhopuu2/source SConscript nan_warn.mk
tuhopuu2/source/blender/avi SConscript
tuhopuu2/source/blender/blenkernel SConscript
tuhopuu2/source/blender/blenlib SConscript
tuhopuu2/source/blender/blenloader SConscript
tuhopuu2/source/blender/blenpluginapi SConscript
tuhopuu2/source/blender/deflate SConscript
tuhopuu2/source/blender/ftfont SConscript
tuhopuu2/source/blender/imbuf SConscript
tuhopuu2/source/blender/img SConscript
tuhopuu2/source/blender/inflate SConscript
tuhopuu2/source/blender/makesdna SConscript
tuhopuu2/source/blender/makesdna/intern SConscript
tuhopuu2/source/blender/python SConscript
tuhopuu2/source/blender/quicktime SConscript
tuhopuu2/source/blender/radiosity SConscript
tuhopuu2/source/blender/readblenfile SConscript
tuhopuu2/source/blender/readstreamglue SConscript
tuhopuu2/source/blender/render SConscript
tuhopuu2/source/blender/renderconverter SConscript
tuhopuu2/source/blender/renderconverter/intern
convertBlenderScene.c
tuhopuu2/source/blender/src SConscript drawtext.c editaction.c
editnla.c editobject.c filesel.c
header_view3d.c interface.c
renderwin.c usiblender.c vpaint.c
tuhopuu2/source/blender/writeblenfile SConscript
tuhopuu2/source/blender/writestreamglue SConscript
tuhopuu2/source/blender/yafray SConscript
tuhopuu2/source/gameengine/BlenderRoutines SConscript
tuhopuu2/source/gameengine/Converter SConscript
tuhopuu2/source/gameengine/Expressions SConscript
tuhopuu2/source/gameengine/GameLogic SConscript
tuhopuu2/source/gameengine/Ketsji SConscript
tuhopuu2/source/gameengine/Ketsji/KXNetwork SConscript
tuhopuu2/source/gameengine/Network SConscript
tuhopuu2/source/gameengine/Network/LoopBackNetwork SConscript
tuhopuu2/source/gameengine/Physics/BlOde SConscript
tuhopuu2/source/gameengine/Physics/Dummy SConscript
tuhopuu2/source/gameengine/Physics/Sumo SConscript
tuhopuu2/source/gameengine/Physics/common SConscript
tuhopuu2/source/gameengine/Rasterizer RAS_IRasterizer.h
SConscript
tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer
SConscript
tuhopuu2/source/gameengine/SceneGraph SConscript
tuhopuu2/source/kernel SConscript
Removed files:
. Makefile.am bootstrap configure.ac
depcomp install-sh ltmain.sh missing
mkinstalldirs
tuhopuu2/intern Makefile.am
tuhopuu2/intern/SoundSystem Makefile.am
tuhopuu2/intern/bmfont Makefile.am
tuhopuu2/intern/bsp Makefile.am
tuhopuu2/intern/container Makefile.am
tuhopuu2/intern/decimation Makefile.am
tuhopuu2/intern/ghost Makefile.am
tuhopuu2/intern/guardedalloc Makefile.am
tuhopuu2/intern/iksolver Makefile.am
tuhopuu2/intern/keymaker Makefile.am
tuhopuu2/intern/memutil Makefile.am
tuhopuu2/intern/moto Makefile.am
tuhopuu2/intern/string Makefile.am
tuhopuu2/source Makefile.am
tuhopuu2/source/blender Makefile.am
tuhopuu2/source/blender/avi Makefile.am
tuhopuu2/source/blender/blenkernel Makefile.am
tuhopuu2/source/blender/blenlib Makefile.am
tuhopuu2/source/blender/blenloader Makefile.am
tuhopuu2/source/blender/blenpluginapi Makefile.am
tuhopuu2/source/blender/decrypt Makefile.am
tuhopuu2/source/blender/deflate Makefile.am
tuhopuu2/source/blender/encrypt Makefile.am
tuhopuu2/source/blender/imbuf Makefile.am
tuhopuu2/source/blender/img Makefile.am
tuhopuu2/source/blender/inflate Makefile.am
tuhopuu2/source/blender/makesdna Makefile.am
tuhopuu2/source/blender/makesdna/intern Makefile.am
tuhopuu2/source/blender/python Makefile.am
tuhopuu2/source/blender/python/api2_2x Makefile.am
tuhopuu2/source/blender/quicktime Makefile.am
tuhopuu2/source/blender/radiosity Makefile.am
tuhopuu2/source/blender/readblenfile Makefile.am
tuhopuu2/source/blender/readstreamglue Makefile.am
tuhopuu2/source/blender/render Makefile.am
tuhopuu2/source/blender/renderconverter Makefile.am
tuhopuu2/source/blender/sign Makefile.am
tuhopuu2/source/blender/src Makefile.am
tuhopuu2/source/blender/verify Makefile.am
tuhopuu2/source/blender/writeblenfile Makefile.am
tuhopuu2/source/blender/writestreamglue Makefile.am
tuhopuu2/source/blender/yafray Makefile.am
tuhopuu2/source/creator Makefile.am
tuhopuu2/source/gameengine Makefile.am
tuhopuu2/source/gameengine/BlenderRoutines Makefile.am
tuhopuu2/source/gameengine/Converter Makefile.am
tuhopuu2/source/gameengine/Expressions Makefile.am
tuhopuu2/source/gameengine/GameLogic Makefile.am
tuhopuu2/source/gameengine/GamePlayer Makefile.am
tuhopuu2/source/gameengine/Ketsji Makefile.am
tuhopuu2/source/gameengine/Network Makefile.am
tuhopuu2/source/gameengine/Physics Makefile.am
tuhopuu2/source/gameengine/Rasterizer Makefile.am
tuhopuu2/source/gameengine/SceneGraph Makefile.am
tuhopuu2/source/icons Makefile.am
tuhopuu2/source/kernel Makefile.am
Log:
Post merge conflict resolution
Revision Changes Path
1.5 +1 -0 tuhopuu2/bin/.blender/.Blanguages
1.2 +50 -50 tuhopuu2/extern/qhull/Announce.txt
1.2 +37 -37 tuhopuu2/extern/qhull/COPYING.txt
1.2 +12 -12 tuhopuu2/extern/qhull/FILE_ID.DIZ
1.2 +318 -318 tuhopuu2/extern/qhull/README.txt
1.2 +37 -37 tuhopuu2/extern/qhull/REGISTER.txt
1.2 +29 -29 tuhopuu2/extern/qhull/VisualC6/qhull.dsw
1.2 +180 -180 tuhopuu2/extern/qhull/VisualC6/qhull/qhull.dsp
1.2 +19 -19 tuhopuu2/extern/qhull/eg/Qhull-go.bat
1.2 +58 -58 tuhopuu2/extern/qhull/eg/q_eg
1.2 +33 -33 tuhopuu2/extern/qhull/eg/q_egtest
1.2 +383 -383 tuhopuu2/extern/qhull/eg/q_test
1.2 +662 -662 tuhopuu2/extern/qhull/eg/q_test.bat
1.2 +742 -742 tuhopuu2/extern/qhull/html/index.htm
1.2 +616 -616 tuhopuu2/extern/qhull/html/qconvex.htm
1.2 +404 -404 tuhopuu2/extern/qhull/html/qdelau_f.htm
1.2 +610 -610 tuhopuu2/extern/qhull/html/qdelaun.htm
1.2 +692 -692 tuhopuu2/extern/qhull/html/qh-eg.htm
1.2 +1503 -1503tuhopuu2/extern/qhull/html/qh-faq.htm
1.2 +108 -108 tuhopuu2/extern/qhull/html/qh-get.htm
1.2 +211 -211 tuhopuu2/extern/qhull/html/qh-home.htm
1.2 +760 -760 tuhopuu2/extern/qhull/html/qh-impre.htm
1.2 +592 -592 tuhopuu2/extern/qhull/html/qh-in.htm
1.2 +289 -289 tuhopuu2/extern/qhull/html/qh-optc.htm
1.2 +657 -657 tuhopuu2/extern/qhull/html/qh-optf.htm
1.2 +271 -271 tuhopuu2/extern/qhull/html/qh-optg.htm
1.2 +343 -343 tuhopuu2/extern/qhull/html/qh-opto.htm
1.2 +249 -249 tuhopuu2/extern/qhull/html/qh-optp.htm
1.2 +696 -696 tuhopuu2/extern/qhull/html/qh-optq.htm
1.2 +275 -275 tuhopuu2/extern/qhull/html/qh-optt.htm
1.2 +489 -489 tuhopuu2/extern/qhull/html/qh-quick.htm
1.2 +566 -566 tuhopuu2/extern/qhull/html/qhalf.htm
1.2 +458 -458 tuhopuu2/extern/qhull/html/qhull.htm
1.2 +1001 -1001tuhopuu2/extern/qhull/html/qhull.man
1.2 +1264 -1264tuhopuu2/extern/qhull/html/qhull.txt
1.2 +408 -408 tuhopuu2/extern/qhull/html/qvoron_f.htm
1.2 +673 -673 tuhopuu2/extern/qhull/html/qvoronoi.htm
1.2 +272 -272 tuhopuu2/extern/qhull/html/rbox.htm
1.2 +176 -176 tuhopuu2/extern/qhull/html/rbox.man
1.2 +198 -198 tuhopuu2/extern/qhull/html/rbox.txt
1.2 +177 -177 tuhopuu2/extern/qhull/include/qhull/geom.h
1.2 +149 -149 tuhopuu2/extern/qhull/include/qhull/io.h
1.2 +174 -174 tuhopuu2/extern/qhull/include/qhull/mem.h
1.2 +171 -171 tuhopuu2/extern/qhull/include/qhull/merge.h
1.2 +290 -290 tuhopuu2/extern/qhull/include/qhull/poly.h
1.2 +1048 -1048tuhopuu2/extern/qhull/include/qhull/qhull.h
1.2 +127 -127 tuhopuu2/extern/qhull/include/qhull/qhull_a.h
1.2 +468 -468 tuhopuu2/extern/qhull/include/qhull/qset.h
1.2 +520 -520 tuhopuu2/extern/qhull/include/qhull/stat.h
1.2 +762 -762 tuhopuu2/extern/qhull/include/qhull/user.h
1.2 +1009 -1009tuhopuu2/extern/qhull/src/Changes.txt
1.2 +186 -186 tuhopuu2/extern/qhull/src/MBorland
1.2 +190 -190 tuhopuu2/extern/qhull/src/Makefile.txt
1.2 +1230 -1230tuhopuu2/extern/qhull/src/geom.c
1.2 +177 -177 tuhopuu2/extern/qhull/src/geom.h
1.2 +2160 -2160tuhopuu2/extern/qhull/src/geom2.c
1.2 +2018 -2018tuhopuu2/extern/qhull/src/global.c
1.2 +239 -239 tuhopuu2/extern/qhull/src/index.htm
1.2 +4089 -4089tuhopuu2/extern/qhull/src/io.c
1.2 +149 -149 tuhopuu2/extern/qhull/src/io.h
1.2 +447 -447 tuhopuu2/extern/qhull/src/mem.c
1.2 +174 -174 tuhopuu2/extern/qhull/src/mem.h
1.2 +3626 -3626tuhopuu2/extern/qhull/src/merge.c
1.2 +171 -171 tuhopuu2/extern/qhull/src/merge.h
1.2 +1180 -1180tuhopuu2/extern/qhull/src/poly.c
1.2 +290 -290 tuhopuu2/extern/qhull/src/poly.h
1.2 +3070 -3070tuhopuu2/extern/qhull/src/poly2.c
1.2 +334 -334 tuhopuu2/extern/qhull/src/qconvex.c
1.2 +323 -323 tuhopuu2/extern/qhull/src/qdelaun.c
1.2 +291 -291 tuhopuu2/extern/qhull/src/qh-geom.htm
1.2 +158 -158 tuhopuu2/extern/qhull/src/qh-globa.htm
1.2 +295 -295 tuhopuu2/extern/qhull/src/qh-io.htm
1.2 +140 -140 tuhopuu2/extern/qhull/src/qh-mem.htm
1.2 +364 -364 tuhopuu2/extern/qhull/src/qh-merge.htm
1.2 +479 -479 tuhopuu2/extern/qhull/src/qh-poly.htm
1.2 +271 -271 tuhopuu2/extern/qhull/src/qh-qhull.htm
1.2 +304 -304 tuhopuu2/extern/qhull/src/qh-set.htm
1.2 +161 -161 tuhopuu2/extern/qhull/src/qh-stat.htm
1.2 +234 -234 tuhopuu2/extern/qhull/src/qh-user.htm
1.2 +324 -324 tuhopuu2/extern/qhull/src/qhalf.c
1.2 +1395 -1395tuhopuu2/extern/qhull/src/qhull.c
1.2 +1048 -1048tuhopuu2/extern/qhull/src/qhull.h
1.2 +127 -127 tuhopuu2/extern/qhull/src/qhull_a.h
1.2 +96 -96 tuhopuu2/extern/qhull/src/qhull_interface.cpp
1.2 +1301 -1301tuhopuu2/extern/qhull/src/qset.c
1.2 +468 -468 tuhopuu2/extern/qhull/src/qset.h
1.2 +318 -318 tuhopuu2/extern/qhull/src/qvoronoi.c
1.2 +788 -788 tuhopuu2/extern/qhull/src/rbox.c
1.2 +700 -700 tuhopuu2/extern/qhull/src/stat.c
1.2 +520 -520 tuhopuu2/extern/qhull/src/stat.h
1.2 +376 -376 tuhopuu2/extern/qhull/src/unix.c
1.2 +324 -324 tuhopuu2/extern/qhull/src/user.c
1.2 +762 -762 tuhopuu2/extern/qhull/src/user.h
1.2 +310 -310 tuhopuu2/extern/qhull/src/user_eg.c
1.2 +532 -532 tuhopuu2/extern/qhull/src/user_eg2.c
1.3 +3 -13 tuhopuu2/intern/SoundSystem/SConscript
1.3 +4 -9 tuhopuu2/intern/bmfont/SConscript
1.3 +3 -9 tuhopuu2/intern/bsp/SConscript
1.3 +3 -9 tuhopuu2/intern/container/SConscript
1.3 +3 -9 tuhopuu2/intern/decimation/SConscript
1.3 +4 -9 tuhopuu2/intern/ghost/SConscript
1.5 +2 -2 tuhopuu2/intern/ghost/intern/GHOST_WindowX11.cpp
1.3 +3 -9 tuhopuu2/intern/guardedalloc/SConscript
1.3 +3 -9 tuhopuu2/intern/iksolver/SConscript
1.3 +3 -9 tuhopuu2/intern/memutil/SConscript
1.3 +3 -9 tuhopuu2/intern/moto/SConscript
1.3 +3 -9 tuhopuu2/intern/string/SConscript
1.3 +2 -1 tuhopuu2/source/SConscript
1.3 +2 -5 tuhopuu2/source/nan_warn.mk
1.3 +3 -9 tuhopuu2/source/blender/avi/SConscript
1.3 +6 -9 tuhopuu2/source/blender/blenkernel/SConscript
1.3 +6 -9 tuhopuu2/source/blender/blenlib/SConscript
1.3 +3 -9 tuhopuu2/source/blender/blenloader/SConscript
1.3 +3 -9 tuhopuu2/source/blender/blenpluginapi/SConscript
1.3 +3 -9 tuhopuu2/source/blender/deflate/SConscript
1.3 +4 -8 tuhopuu2/source/blender/ftfont/SConscript
1.3 +3 -9 tuhopuu2/source/blender/imbuf/SConscript
1.3 +3 -9 tuhopuu2/source/blender/img/SConscript
1.3 +3 -10 tuhopuu2/source/blender/inflate/SConscript
1.3 +3 -9 tuhopuu2/source/blender/makesdna/SConscript
1.3 +3 -2 tuhopuu2/source/blender/makesdna/intern/SConscript
1.3 +7 -9 tuhopuu2/source/blender/python/SConscript
1.3 +4 -9 tuhopuu2/source/blender/quicktime/SConscript
1.3 +5 -9 tuhopuu2/source/blender/radiosity/SConscript
1.3 +3 -9 tuhopuu2/source/blender/readblenfile/SConscript
1.3 +3 -9 tuhopuu2/source/blender/readstreamglue/SConscript
1.3 +3 -9 tuhopuu2/source/blender/render/SConscript
1.3 +3 -9 tuhopuu2/source/blender/renderconverter/SConscript
1.19 +11 -3 tuhopuu2/source/blender/renderconverter/intern/convertBlenderScene.c
1.4 +9 -12 tuhopuu2/source/blender/src/SConscript
1.4 +124 -181 tuhopuu2/source/blender/src/drawtext.c
1.4 +17 -7 tuhopuu2/source/blender/src/editaction.c
1.5 +3 -3 tuhopuu2/source/blender/src/editnla.c
1.54 +2 -1 tuhopuu2/source/blender/src/editobject.c
1.8 +3 -2 tuhopuu2/source/blender/src/filesel.c
1.12 +4 -4 tuhopuu2/source/blender/src/header_view3d.c
1.14 +4 -4 tuhopuu2/source/blender/src/interface.c
1.6 +8 -1 tuhopuu2/source/blender/src/renderwin.c
1.13 +6 -4 tuhopuu2/source/blender/src/usiblender.c
1.7 +3 -3 tuhopuu2/source/blender/src/vpaint.c
1.3 +3 -9 tuhopuu2/source/blender/writeblenfile/SConscript
1.3 +3 -9 tuhopuu2/source/blender/writestreamglue/SConscript
1.3 +3 -9 tuhopuu2/source/blender/yafray/SConscript
1.4 +5 -12 tuhopuu2/source/gameengine/BlenderRoutines/SConscript
1.4 +5 -11 tuhopuu2/source/gameengine/Converter/SConscript
1.4 +4 -10 tuhopuu2/source/gameengine/Expressions/SConscript
1.3 +3 -9 tuhopuu2/source/gameengine/GameLogic/SConscript
1.4 +4 -10 tuhopuu2/source/gameengine/Ketsji/SConscript
1.4 +4 -10 tuhopuu2/source/gameengine/Ketsji/KXNetwork/SConscript
1.4 +4 -10 tuhopuu2/source/gameengine/Network/SConscript
1.3 +3 -9 tuhopuu2/source/gameengine/Network/LoopBackNetwork/SConscript
1.3 +11 -17 tuhopuu2/source/gameengine/Physics/BlOde/SConscript
1.3 +3 -9 tuhopuu2/source/gameengine/Physics/Dummy/SConscript
1.3 +6 -10 tuhopuu2/source/gameengine/Physics/Sumo/SConscript
1.3 +3 -9 tuhopuu2/source/gameengine/Physics/common/SConscript
1.3 +4 -10 tuhopuu2/source/gameengine/Rasterizer/RAS_IRasterizer.h
1.4 +4 -10 tuhopuu2/source/gameengine/Rasterizer/SConscript
1.4 +6 -12 tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
1.3 +3 -9 tuhopuu2/source/gameengine/SceneGraph/SConscript
1.3 +3 -9 tuhopuu2/source/kernel/SConscript
More information about the tuhopuu-cvs
mailing list