Fixed merge with Desktop Summit work
authorLuciano Montanaro <mikelima@cirulla.net>
Sun, 28 Aug 2011 10:54:42 +0000 (12:54 +0200)
committerLuciano Montanaro <mikelima@cirulla.net>
Tue, 27 Dec 2011 22:16:51 +0000 (23:16 +0100)
commitf10436ff38d34d10915a6fc1c9b2513f30b16df2
treefc429bfc09708764a82c6d7e163adcf0f887a5b2
parent96971bcc1b07902d23a9a8ad0d54efc211fff8fd
Fixed merge with Desktop Summit work
application/settings.cpp