Merge branch 'devel' of gitorious.org:mldemos/mldemos into devel
authorotpal <otpal.vittoz@gmail.com>
Wed, 13 Jun 2012 09:56:43 +0000 (11:56 +0200)
committerotpal <otpal.vittoz@gmail.com>
Wed, 13 Jun 2012 09:56:43 +0000 (11:56 +0200)
commitd78f49f671fb651f027213b98226c5214dbadac6
treef0d279615b4d5b573116b02f01bc244c30b9f159
parentc69dd166ccb31576c4cf3d589e1736bfee4303aa
Merge branch 'devel' of gitorious.org:mldemos/mldemos into devel

Conflicts:
Core/Core.pro
Core/drawTimer.h
MLDemos/mlprocessing.cpp
MLDemos/icons/spinner-24x24.gif [new file with mode: 0644]