Merge branch 'controls'
authorAlex Fiestas <alex@eyeos.org>
Thu, 19 Nov 2009 12:18:47 +0000 (12:18 +0000)
committerAlex Fiestas <alex@eyeos.org>
Thu, 19 Nov 2009 12:18:47 +0000 (12:18 +0000)
commitf295b2ff7886cb0456a7a43c0bffbc6a63095199
treee280cdfc4f2b2be0110da4101e3d9e3dc950fe0c
parent60ae3ee8bc22f2f8aedb4cf394db072ef8c9ce78
parent73184d00ec4ef2136cfc680303f15f48f0b78e3b
Merge branch 'controls'

Conflicts:
src/CMakeLists.txt
src/kamoso.cpp
src/kamoso.h
CMakeLists.txt
src/CMakeLists.txt
src/kamoso.cpp
src/kamoso.h