This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Tamito Kajiyama a5152b7ca0 Merged changes in the trunk up to revision 46787. ...

Conflicts resolved:
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/makesrna/intern/rna_main.c

2012-05-19 08:40:56 +00:00

..

bad_level_call_stubs

Merged changes in the trunk up to revision 46787.

2012-05-19 08:40:56 +00:00

CMakeLists.txt

Fix blenderplayer utf8 cmake for MinGW (linking order matters for gcc)

2012-03-21 12:35:39 +00:00