Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel
authorb4silio <b4silio@gmail.com>
Wed, 19 Oct 2011 13:24:21 +0000 (15:24 +0200)
committerb4silio <b4silio@gmail.com>
Wed, 19 Oct 2011 13:24:21 +0000 (15:24 +0200)
commit4d050bf6522c84348bcadd94e1a504a628b700c8
treed29c29f6d09acaa47ef721ba81bd1862f4b2c354
parentb826934ffb7e6594706befe0e59dce127a43df7d
parentc1e09b85dfa7cc6e286b63f6b05fa5ef340e5935
Merge branch 'devel' of git://gitorious.org/mldemos/mldemos into devel

Conflicts:
Core/basicMath.h
Core/basicMath.h
Core/expose.cpp