Tamito Kajiyama ed0e2fbd9f Merged changes in the trunk up to revision 52690. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenlib/intern/bpath.c

2012-12-01 02:47:59 +00:00

..

intern

Merged changes in the trunk up to revision 52690.

2012-12-01 02:47:59 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 51448.

2012-10-20 16:48:48 +00:00

SConscript

Merged changes in the trunk up to revision 49986.

2012-08-18 15:20:35 +00:00

WM_api.h

Fix #33330: Proxies are not built in Sequencer if preview is visible

2012-11-28 09:36:23 +00:00

wm_cursors.h

style cleanup: mostly whitespace in rna

2012-05-12 11:01:29 +00:00

wm_draw.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

wm_event_system.h

style cleanup: trailing tabs & expand some non prefix tabs into spaces.

2012-10-21 05:46:41 +00:00

wm_event_types.h

style cleanup: comments & spelling

2012-11-18 01:22:31 +00:00

wm_files.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

WM_keymap.h

all remove functions now invalidate the RNA objects passed, to help script authors to avoid bugs with accessing removed data.

2012-11-02 09:41:26 +00:00

wm_subwindow.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

WM_types.h

Merged changes in the trunk up to revision 52690.

2012-12-01 02:47:59 +00:00

wm_window.h

code cleanup: minor edits

2012-07-01 22:19:19 +00:00

wm.h

Code Cleanup: remove non existing function declarations.

2012-02-29 15:00:37 +00:00