Mercurial > trustbridge
annotate .hgchurn @ 657:37ffc8ddb698
Fix merge errors
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Wed, 25 Jun 2014 15:31:08 +0200 |
| parents | fa9bcad3fe65 |
| children |
| rev | line source |
|---|---|
|
544
fa9bcad3fe65
Added .hgchurn with Real Names.
Bernhard Reiter <bernhard@intevation.de>
parents:
diff
changeset
|
1 aheinecke@intevation.de=Andre Heinecke |
|
fa9bcad3fe65
Added .hgchurn with Real Names.
Bernhard Reiter <bernhard@intevation.de>
parents:
diff
changeset
|
2 andre.heinecke@intevation.de=Andre Heinecke |
|
fa9bcad3fe65
Added .hgchurn with Real Names.
Bernhard Reiter <bernhard@intevation.de>
parents:
diff
changeset
|
3 bernhard@intevation.de=Bernhard Reiter |
|
fa9bcad3fe65
Added .hgchurn with Real Names.
Bernhard Reiter <bernhard@intevation.de>
parents:
diff
changeset
|
4 rrenkert@intevation.de=Raimund Renkert |
|
fa9bcad3fe65
Added .hgchurn with Real Names.
Bernhard Reiter <bernhard@intevation.de>
parents:
diff
changeset
|
5 wilde@intevation.de=Sascha Wilde |
|
fa9bcad3fe65
Added .hgchurn with Real Names.
Bernhard Reiter <bernhard@intevation.de>
parents:
diff
changeset
|
6 emanuel@intevation.de=Emanuel Schütze |