From: Michael Sartain <mikesart@valvesoftware.com>
Date: Fri, 14 Mar 2014 15:56:39 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/stativ/vogl into stativ-master
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=38bc71866f3985963881a74e69483ec2e0cb20d9;hp=38bc71866f3985963881a74e69483ec2e0cb20d9;p=vogl

Merge branch 'master' of https://github.com/stativ/vogl into stativ-master

Conflicts:
	src/vogleditor/CMakeLists.txt
---