Merge branch '1.1'
authorMilian Wolff <mail@milianw.de>
Tue, 2 Nov 2010 11:48:54 +0000 (12:48 +0100)
committerMilian Wolff <mail@milianw.de>
Tue, 2 Nov 2010 11:48:54 +0000 (12:48 +0100)
commitc4e4d1a34b9b075db2bcdca533c0abc941ffb758
tree80291ea5ebee87441916520a78e2f2b81a87e017
parent3a86493701ea877f465a15f524687bd1d99251df
parente0b1bc08ae0ff81be7d192d3b2d9048f6f2a0179
Merge branch '1.1'
shell/launchconfigurationdialog.cpp