Merge branch 'master' of gitorious.org:kamoso/mainline
authorAlex Fiestas <alex@eyeos.org>
Thu, 17 Sep 2009 08:23:55 +0000 (08:23 +0000)
committerAlex Fiestas <alex@eyeos.org>
Thu, 17 Sep 2009 08:23:55 +0000 (08:23 +0000)
commitd6c0c4a0f242d9afb1c6bdc4db7619663b9dce2b
tree229c92fd870659ce3af1a55f4e912ee8b68b6e78
parent242da3f12662fa6ee46c96d915432316cf6fd80a
parent96068ba00798f2849bf693220fabcc2c0a06f6b0
Merge branch 'master' of gitorious.org:kamoso/mainline
CMakeLists.txt
src/kamoso.cpp