[tuhopuu-cvs] CVS commit: tuhopuu2 Makefile.am configure.ac tuhopuu2/bin/.blender .Blanguages tuhopuu2/intern/SoundSystem Makefile.am SND_DependKludge.h tuhopuu2/intern/SoundSystem/intern Makefile tuhopuu2/intern/ghost/intern GHOST_WindowCarbon.cpp ...
Chris Want
cwant at ualberta.ca
Mon Nov 10 02:21:35 CET 2003
hos (Chris Want) 2003/11/10 02:21:34 CET
Modified files:
. Makefile.am configure.ac
tuhopuu2/bin/.blender .Blanguages
tuhopuu2/intern/SoundSystem Makefile.am SND_DependKludge.h
tuhopuu2/intern/SoundSystem/intern Makefile
tuhopuu2/intern/ghost/intern GHOST_WindowCarbon.cpp
GHOST_WindowWin32.cpp
GHOST_WindowX11.cpp
tuhopuu2/intern/guardedalloc/intern mallocn.c
tuhopuu2/po cs.po
tuhopuu2/projectfiles/blender blender.dsp
tuhopuu2/projectfiles/blender/src BL_src.dsp
tuhopuu2/source Makefile nan_definitions.mk
tuhopuu2/source/blender Makefile.am
tuhopuu2/source/blender/blenkernel BKE_text.h
tuhopuu2/source/blender/blenkernel/intern blender.c
constraint.c
displist.c mball.c
object.c
tuhopuu2/source/blender/blenloader/intern readfile.c
writefile.c
tuhopuu2/source/blender/ftfont/intern FTF_TTFont.cpp
tuhopuu2/source/blender/imbuf/intern filter.c
tuhopuu2/source/blender/include BDR_drawobject.h
BDR_editobject.h
BIF_editarmature.h
BIF_editconstraint.h
BIF_editmesh.h BIF_graphics.h
BIF_interface.h
BIF_resources.h BIF_screen.h
BSE_drawview.h BSE_view.h
blendef.h interface.h
tuhopuu2/source/blender/makesdna DNA_constraint_types.h
DNA_meta_types.h
DNA_scene_types.h
DNA_screen_types.h
DNA_userdef_types.h
DNA_view3d_types.h
tuhopuu2/source/blender/render/extern/include render_types.h
tuhopuu2/source/blender/render/intern/source initrender.c
renderdatabase.c
shadbuf.c
tuhopuu2/source/blender/renderconverter/intern
convertBlenderScene.c
tuhopuu2/source/blender/src Makefile.am blenderbuttons.c
drawmesh.c drawnla.c drawobject.c
drawview.c edit.c editarmature.c
editconstraint.c editipo.c
editmball.c editmesh.c editnla.c
editobject.c editscreen.c
editview.c filesel.c ghostwinlay.c
headerbuttons.c interface.c
language.c renderwin.c resources.c
space.c toets.c toolbox.c
usiblender.c view.c vpaint.c
tuhopuu2/source/gameengine/Ketsji KX_PhysicsEngineEnums.h
Log:
Fixing the conflicts due to the CVS merge ...
Revision Changes Path
1.3 +22 -1 tuhopuu2/Makefile.am
1.6 +320 -92 tuhopuu2/configure.ac
1.3 +2 -0 tuhopuu2/bin/.blender/.Blanguages
1.4 +2 -4 tuhopuu2/intern/SoundSystem/Makefile.am
1.3 +5 -3 tuhopuu2/intern/SoundSystem/SND_DependKludge.h
1.3 +2 -2 tuhopuu2/intern/SoundSystem/intern/Makefile
1.3 +9 -4 tuhopuu2/intern/ghost/intern/GHOST_WindowCarbon.cpp
1.3 +22 -24 tuhopuu2/intern/ghost/intern/GHOST_WindowWin32.cpp
1.3 +2 -2 tuhopuu2/intern/ghost/intern/GHOST_WindowX11.cpp
1.3 +1 -2 tuhopuu2/intern/guardedalloc/intern/mallocn.c
1.2 +9 -9 tuhopuu2/po/cs.po
1.6 +4 -5 tuhopuu2/projectfiles/blender/blender.dsp
1.5 +93 -5 tuhopuu2/projectfiles/blender/src/BL_src.dsp
1.3 +2 -2 tuhopuu2/source/Makefile
1.3 +35 -52 tuhopuu2/source/nan_definitions.mk
1.3 +2 -1 tuhopuu2/source/blender/Makefile.am
1.3 +6 -1 tuhopuu2/source/blender/blenkernel/BKE_text.h
1.4 +12 -1 tuhopuu2/source/blender/blenkernel/intern/blender.c
1.6 +85 -8 tuhopuu2/source/blender/blenkernel/intern/constraint.c
1.3 +58 -25 tuhopuu2/source/blender/blenkernel/intern/displist.c
1.3 +115 -63 tuhopuu2/source/blender/blenkernel/intern/mball.c
1.3 +4 -3 tuhopuu2/source/blender/blenkernel/intern/object.c
1.5 +200 -7 tuhopuu2/source/blender/blenloader/intern/readfile.c
1.4 +29 -1 tuhopuu2/source/blender/blenloader/intern/writefile.c
1.3 +41 -40 tuhopuu2/source/blender/ftfont/intern/FTF_TTFont.cpp
1.3 +3 -3 tuhopuu2/source/blender/imbuf/intern/filter.c
1.8 +1 -2 tuhopuu2/source/blender/include/BDR_drawobject.h
1.3 +2 -1 tuhopuu2/source/blender/include/BDR_editobject.h
1.4 +4 -2 tuhopuu2/source/blender/include/BIF_editarmature.h
1.5 +5 -4 tuhopuu2/source/blender/include/BIF_editconstraint.h
1.8 +57 -3 tuhopuu2/source/blender/include/BIF_editmesh.h
1.3 +2 -2 tuhopuu2/source/blender/include/BIF_graphics.h
1.3 +130 -2 tuhopuu2/source/blender/include/BIF_interface.h
1.4 +98 -18 tuhopuu2/source/blender/include/BIF_resources.h
1.3 +3 -3 tuhopuu2/source/blender/include/BIF_screen.h
1.3 +4 -1 tuhopuu2/source/blender/include/BSE_drawview.h
1.4 +7 -2 tuhopuu2/source/blender/include/BSE_view.h
1.7 +2 -2 tuhopuu2/source/blender/include/blendef.h
1.3 +167 -57 tuhopuu2/source/blender/include/interface.h
1.3 +34 -2 tuhopuu2/source/blender/makesdna/DNA_constraint_types.h
1.3 +9 -6 tuhopuu2/source/blender/makesdna/DNA_meta_types.h
1.5 +5 -5 tuhopuu2/source/blender/makesdna/DNA_scene_types.h
1.4 +22 -5 tuhopuu2/source/blender/makesdna/DNA_screen_types.h
1.7 +89 -3 tuhopuu2/source/blender/makesdna/DNA_userdef_types.h
1.3 +9 -2 tuhopuu2/source/blender/makesdna/DNA_view3d_types.h
1.3 +14 -4 tuhopuu2/source/blender/render/extern/include/render_types.h
1.3 +24 -39 tuhopuu2/source/blender/render/intern/source/initrender.c
1.3 +23 -13 tuhopuu2/source/blender/render/intern/source/renderdatabase.c
1.3 +2 -2 tuhopuu2/source/blender/render/intern/source/shadbuf.c
1.4 +33 -23 tuhopuu2/source/blender/renderconverter/intern/convertBlenderScene.c
1.5 +24 -3 tuhopuu2/source/blender/src/Makefile.am
1.3 +1319 -1306tuhopuu2/source/blender/src/blenderbuttons.c
1.3 +10 -10 tuhopuu2/source/blender/src/drawmesh.c
1.3 +47 -64 tuhopuu2/source/blender/src/drawnla.c
1.19 +178 -123 tuhopuu2/source/blender/src/drawobject.c
1.3 +780 -92 tuhopuu2/source/blender/src/drawview.c
1.5 +44 -19 tuhopuu2/source/blender/src/edit.c
1.4 +38 -36 tuhopuu2/source/blender/src/editarmature.c
1.6 +117 -17 tuhopuu2/source/blender/src/editconstraint.c
1.3 +157 -157 tuhopuu2/source/blender/src/editipo.c
1.3 +4 -7 tuhopuu2/source/blender/src/editmball.c
1.31 +2454 -119 tuhopuu2/source/blender/src/editmesh.c
1.3 +23 -25 tuhopuu2/source/blender/src/editnla.c
1.25 +312 -96 tuhopuu2/source/blender/src/editobject.c
1.7 +258 -147 tuhopuu2/source/blender/src/editscreen.c
1.6 +37 -37 tuhopuu2/source/blender/src/editview.c
1.4 +37 -40 tuhopuu2/source/blender/src/filesel.c
1.3 +19 -10 tuhopuu2/source/blender/src/ghostwinlay.c
1.13 +183 -180 tuhopuu2/source/blender/src/headerbuttons.c
1.6 +823 -575 tuhopuu2/source/blender/src/interface.c
1.3 +6 -21 tuhopuu2/source/blender/src/language.c
1.3 +12 -8 tuhopuu2/source/blender/src/renderwin.c
1.4 +1159 -39 tuhopuu2/source/blender/src/resources.c
1.21 +1004 -471 tuhopuu2/source/blender/src/space.c
1.3 +172 -131 tuhopuu2/source/blender/src/toets.c
1.3 +609 -30 tuhopuu2/source/blender/src/toolbox.c
1.7 +35 -37 tuhopuu2/source/blender/src/usiblender.c
1.7 +55 -9 tuhopuu2/source/blender/src/view.c
1.3 +2 -4 tuhopuu2/source/blender/src/vpaint.c
1.3 +0 -0 tuhopuu2/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
More information about the tuhopuu-cvs
mailing list