merge outliner refactor so we dont have to keep outliner.c locked in trunk.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 11 Aug 2011 05:46:18 +0000 (05:46 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 11 Aug 2011 05:46:18 +0000 (05:46 +0000)
commite97617e3fbf2281326ba471fc72c71b52f8b0fdb
tree6e3af555ad58af2b00ae2e4b86e71060ce594dc3
parent07e8bfd2f2a09452d61645f32479c60eb4be85b7
parentfde1dc0fb2fd6275e85821f12a6bc362cc6a2d38
merge outliner refactor so we dont have to keep outliner.c locked in trunk.

this wont build because of changes spesific to pepper, fix coming next.

svn merge source/blender/editors/space_outliner -r36830:38987 https://svn.blender.org/svnroot/bf-blender/branches/soc-2011-pepper/source/blender/editors/space_outliner