resolved conflict state with HEAD r14096
authorJean-Luc Peurière <jlp@nerim.net>
Thu, 13 Mar 2008 23:54:02 +0000 (23:54 +0000)
committerJean-Luc Peurière <jlp@nerim.net>
Thu, 13 Mar 2008 23:54:02 +0000 (23:54 +0000)
commita68a7f42b02ad0260220d94f36ab61c772db071a
tree620b763cd24fbfc1259f00ccb005217914af0c6f
parent526d0bec4722900a86d81ff0f5d71504b2b4ad8c
parent15215493bf9d1d08e650109e6eb6189fc76e289e
resolved conflict state with HEAD r14096
blenderbuttons still bad

not let this compile
69 files changed:
CMakeLists.txt
bin/.blender/.Blanguages
config/darwin-config.py
intern/ghost/GHOST_C-api.h
intern/ghost/GHOST_ISystem.h
intern/ghost/intern/GHOST_C-api.cpp
intern/ghost/intern/GHOST_System.h
intern/ghost/intern/GHOST_SystemCarbon.cpp
intern/ghost/intern/GHOST_SystemCarbon.h
intern/ghost/intern/GHOST_SystemWin32.cpp
intern/ghost/intern/GHOST_SystemX11.cpp
intern/ghost/intern/GHOST_SystemX11.h
projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj
projectfiles_vc7/blender/render/BRE_render.vcproj
projectfiles_vc7/blender/src/BL_src.vcproj
release/datafiles/splash.jpg
source/blender/blenkernel/BKE_global.h
source/blender/blenlib/BLI_blenlib.h
source/blender/blenloader/intern/writefile.c
source/blender/include/BIF_resources.h
source/blender/include/BIF_transform.h
source/blender/include/BSE_view.h
source/blender/include/blendef.h
source/blender/include/mydevice.h
source/blender/include/transform.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/python/api2_2x/Armature.c
source/blender/python/api2_2x/BezTriple.c
source/blender/python/api2_2x/Bone.c
source/blender/python/api2_2x/Bone.h
source/blender/python/api2_2x/CurNurb.c
source/blender/python/api2_2x/Curve.c
source/blender/python/api2_2x/Draw.h
source/blender/python/api2_2x/Geometry.c
source/blender/python/api2_2x/Ipo.c
source/blender/python/api2_2x/Ipocurve.c
source/blender/python/api2_2x/Ipocurve.h
source/blender/python/api2_2x/Key.c
source/blender/python/api2_2x/Lattice.c
source/blender/python/api2_2x/Library.c
source/blender/python/api2_2x/Mathutils.h
source/blender/python/api2_2x/Metaball.c
source/blender/python/api2_2x/Noise.c
source/blender/python/api2_2x/Sound.c
source/blender/python/api2_2x/SurfNurb.c
source/blender/python/api2_2x/Sys.c
source/blender/python/api2_2x/Text3d.c
source/blender/python/api2_2x/Types.c
source/blender/python/api2_2x/World.c
source/blender/python/api2_2x/bpy_config.c
source/blender/python/api2_2x/euler.c
source/blender/python/api2_2x/gen_utils.h
source/blender/python/api2_2x/logic.c
source/blender/python/api2_2x/matrix.c
source/blender/python/api2_2x/rgbTuple.c
source/blender/python/api2_2x/sceneSequence.h
source/blender/src/blenderbuttons.c
source/blender/src/editscreen.c
source/blender/src/ghostwinlay.c
source/blender/src/header_view3d.c
source/blender/src/space.c
source/blender/src/splash.jpg.c
source/blender/src/transform.c
source/blender/src/transform_generics.c
source/blender/src/usiblender.c
source/blender/src/view.c
source/blender/src/winlay.h