Merge branch 'dev_itkonma'
authoritkonma <marko.itkonen@ixonos.com>
Mon, 1 Jun 2009 08:50:08 +0000 (11:50 +0300)
committeritkonma <marko.itkonen@ixonos.com>
Mon, 1 Jun 2009 08:50:08 +0000 (11:50 +0300)
commita85316b005e03207e250a47aae018cfcd15c7bc7
treefe598d76f9f0199ca36038e43f4ca283e434fcf0
parent3c019b17cf2052d8fe5bdfc04a986c520ff409e7
parent55915c819fb472acaf93f560bad7a11a4ad89828
Merge branch 'dev_itkonma'

Conflicts:
src/BusinessLogic/UIManager.cpp
src/BusinessLogic/UIManager.h
src/Domain/Configuration/Configuration.cpp
src/Domain/Configuration/Configuration.cpp