Mercurial > trustbridge
diff ui/mainwindow.h @ 657:37ffc8ddb698
Fix merge errors
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Wed, 25 Jun 2014 15:31:08 +0200 |
parents | 129e611eaf50 |
children | a2e94e88d304 |
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Wed, 25 Jun 2014 15:31:08 +0200 |
parents | 129e611eaf50 |
children | a2e94e88d304 |