Merge branch 'master' of github.com:libremapping/libremapping

Conflicts:
	MapperGLCanvas.cpp

prototypes/shm/read.sh

@@ -0,0 +1,5 @@
+gst-launch -e shmsrc socket-path=/tmp/test is-live=1 ! \
+    video/x-raw-yuv,format=\(fourcc\)I420,framerate=30/1,width=640,height=480 ! \
+    xvimagesink 
+
+

prototypes/shm/write.sh

@@ -0,0 +1,5 @@
+gst-launch -v videotestsrc ! \
+   'video/x-raw-yuv, width=640, height=480, framerate=30/1, format=(fourcc)I420' ! \
+   shmsink socket-path=/tmp/test shm-size=10000000 wait-for-connection=0
+
+