]> git.jsancho.org Git - lugaru.git/commitdiff
Merged
authorNeal Gompa <ngompa13@gmail.com>
Thu, 13 May 2010 23:14:24 +0000 (18:14 -0500)
committerNeal Gompa <ngompa13@gmail.com>
Thu, 13 May 2010 23:14:24 +0000 (18:14 -0500)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge