Merge branch 'master' of git@github.com:slackito/fov120
authorRafael Gaitán Linares <rgaitan@sparrow-2.local>
Mon, 7 Dec 2009 01:40:58 +0000 (02:40 +0100)
committerRafael Gaitán Linares <rgaitan@sparrow-2.local>
Mon, 7 Dec 2009 01:40:58 +0000 (02:40 +0100)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge