Merge branch 'master' into soc-2014-viewport_fxsoc-2014-viewport_fx

I have resolved some differences, for instance selection code which was more or less a stub, to be
the same as master. This will have to be fixed later.

Conflicts:
	CMakeLists.txt
	intern/ghost/CMakeLists.txt
	intern/ghost/intern/GHOST_SystemWin32.cpp
	intern/ghost/intern/GHOST_Window.cpp
	intern/ghost/intern/GHOST_WindowWin32.cpp
	intern/ghost/intern/GHOST_WindowX11.cpp
	source/blender/blenlib/BLI_math_matrix.h
	source/blender/blenlib/intern/math_matrix.c
	source/blender/gpu/CMakeLists.txt
	source/blender/gpu/GPU_select.h
	source/blender/gpu/intern/gpu_buffers.c
	source/blender/gpu/intern/gpu_draw.c
	source/blender/gpu/intern/gpu_extensions.c
	source/blender/gpu/intern/gpu_select.c
	source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
	source/blender/nodes/CMakeLists.txt

1 files changed, 2 insertions, 2 deletions

diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.h b/source/blender/freestyle/intern/view_map/SteerableViewMap.h
index 0cd5d222621..3a660627776 100644
--- a/source/blender/freestyle/intern/view_map/SteerableViewMap.h
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.h
@@ -54,7 +54,7 @@ class GrayImage;
 class SteerableViewMap
 {
 protected:
-	// for each vector the list of nbOrientations weigths corresponding to its contributions
+	// for each vector the list of nbOrientations weights corresponding to its contributions
 	// to the nbOrientations directional maps
 	map<unsigned int, double*> _mapping;
 	unsigned _nbOrientations;
@@ -73,7 +73,7 @@ public:
 	virtual void Reset();
 
 	/*! Adds a FEdge to steerable VM.
-	 *  Returns the nbOrientations weigths corresponding to the FEdge contributions to the nbOrientations
+	 *  Returns the nbOrientations weights corresponding to the FEdge contributions to the nbOrientations
 	 *  directional maps.
 	 */
 	double *AddFEdge(FEdge *iFEdge);