Merge branch 'multiple-identities'
commitf8612ada729a5d98ca6b4b1d90fabaf3960fb4d2
authorJan Kundrát <jkt@flaska.net>
Sat, 8 Dec 2012 00:23:41 +0000 (8 01:23 +0100)
committerJan Kundrát <jkt@flaska.net>
Sat, 8 Dec 2012 00:23:41 +0000 (8 01:23 +0100)
tree2c0574617263687081eeb7584b638ee44ecd03fb
parent1e36003f3226428e4ca0153083adae6eb183f798
parentda98e6929e330d1f5a469d3dca3b832053d476fe
Merge branch 'multiple-identities'

fixes #589
src/Gui/Window.cpp