]> git.cworth.org Git - vogl/commit
Merge branch 'master' of https://github.com/stativ/vogl into stativ-master
authorMichael Sartain <mikesart@valvesoftware.com>
Fri, 14 Mar 2014 15:56:39 +0000 (08:56 -0700)
committerCarl Worth <cworth@cworth.org>
Tue, 1 Apr 2014 19:37:24 +0000 (12:37 -0700)
commit38bc71866f3985963881a74e69483ec2e0cb20d9
tree25e49c77877cbddfe551aae81466fda45b8bcbce
parentc3e6b8e41e67b2faf4475dc8f0ba2633f24b2b2f
parent9efcfb2c254b732a4d9494c08ad6641cebb7ce79
Merge branch 'master' of https://github.com/stativ/vogl into stativ-master

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