Mercurial > trustbridge
annotate ui/img/icon.rc @ 657:37ffc8ddb698
Fix merge errors
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Wed, 25 Jun 2014 15:31:08 +0200 |
parents | bc02ee484067 |
children |
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Wed, 25 Jun 2014 15:31:08 +0200 |
parents | bc02ee484067 |
children |