Joshua Leung b79762a7c3 Bugfix [#26438]: Hotkey conflict between add meta-strip and add marker ...

The sequencer made it's own copy of the Markers keymap, which was
inconsistent with the rest of Blender, making things confusing to use.
I've removed these duplicate keymap entries, and also changed the
conflicting hotkeys for Metastrips.

Metastrips now use the same hotkeys that their NLA cousins use:
Shift-G to add, Alt-G to remove; These were chosen since in user-
terms, metastrips are more like "strip groups"

2011-03-10 23:26:59 +00:00

..

blender

Bugfix [#26438]: Hotkey conflict between add meta-strip and add marker

2011-03-10 23:26:59 +00:00

blenderplayer

blenderplayer building again in CMake + OSX (and Linux I guess) patch from IRIE Shinsuke

2011-03-05 09:27:14 +00:00

creator

Fix small error in chdir + cmd combination.

2011-03-10 00:21:36 +00:00

darwin

remove nan-makefiles

2011-01-30 15:29:22 +00:00

gameengine

add stddef.h include for offsetof macro for gcc 4.6 compat.

2011-03-09 02:06:21 +00:00

icons

remove nan-makefiles

2011-01-30 15:29:22 +00:00

kernel

doxygen: kernel/gen_system tagged.

2011-02-25 13:25:53 +00:00

tests

replace import *'s with named imports (using * is convenient for some scripts but considered bad practice by python devs)

2011-02-27 15:25:24 +00:00

CMakeLists.txt

- fix problem with cmake, windows 'RelWithDebInfo' target, was giving error: "ImportError: No module named _socket" because of copying wrong files over.

2011-01-23 11:42:29 +00:00

SConscript

dont build blender/kernel if the game engines disabled.

2010-10-31 00:56:46 +00:00