diff ui/administratorwindow.cpp @ 657:37ffc8ddb698

Fix merge errors
author Andre Heinecke <andre.heinecke@intevation.de>
date Wed, 25 Jun 2014 15:31:08 +0200
parents c9d296f04995
children 75cd2fbf9ac6
line wrap: on
line diff

http://wald.intevation.org/projects/trustbridge/