Merge branch 'master' into dev_properties_side_bar

Conflicts:
	source/app/plaYUVerApp.cpp
This commit is contained in:
jfmcarreira committed 2014-04-15 23:34:04 +01:00
commit 9c20af5d1a

Diff Content Not Available