Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Sat, 11 Dec 2010 11:20:36 +0000 (12:20 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Sat, 11 Dec 2010 11:20:36 +0000 (12:20 +0100)
commit83e780aa14c8f51c89ff80c7ac2b67de5b8dc3b8
tree548d426f9c6ed06de3403d589932eaaaabb805e7
parent59fb353ca955f4d6806938fccbe3100cee86b902
parentfe4e69236a090ad6c0e125814313f275d2716b53
Merge branch 'master' into experimental
lib/gui/elistboxcontent.cpp