]> git.cworth.org Git - vogl/commitdiff
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)
Conflicts:
src/vogleditor/CMakeLists.txt


No differences found