[Bf-blender-cvs] [749ed3f] gtest-staging: Merge branch 'master' into gtest-staging

[Campbell Barton]

Commit: 749ed3f62f7f808e09e0b363fb405e1f5661065d
Author: Campbell Barton
Date:   Sun Sep 28 19:24:34 2014 +1000
Branches: gtest-staging
https://developer.blender.org/rB749ed3f62f7f808e09e0b363fb405e1f5661065d

Merge branch 'master' into gtest-staging

Conflicts:
	source/blender/blenlib/BLI_stack.h
	source/blender/blenlib/intern/stack.c
	tests/gtests/blenlib/BLI_stack_test.cc
	tests/gtests/blenlib/CMakeLists.txt

===================================================================



===================================================================

diff --cc tests/gtests/blenlib/CMakeLists.txt
index 3d30d11,07b89a9..c949c1e
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@@ -37,5 -38,6 +38,7 @@@ set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMA
  BLENDER_TEST(BLI_stack "bf_blenlib")
  BLENDER_TEST(BLI_math_color "bf_blenlib")
  BLENDER_TEST(BLI_math_geom "bf_blenlib")
- BLENDER_TEST(BLI_polyfill2d "bf_blenlib")
+ BLENDER_TEST(BLI_string "bf_blenlib")
  BLENDER_TEST(BLI_path_util "bf_blenlib;extern_wcwidth;${ZLIB_LIBRARIES}")
++BLENDER_TEST(BLI_polyfill2d "bf_blenlib")
+ BLENDER_TEST(BLI_listbase "bf_blenlib")