projects / potlatch2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fe4474 050c36e)
Merge pull request #85 from EdLoach/master
authorRichard Fairhurst <richard@systemeD.net>
Tue, 13 Nov 2012 11:27:55 +0000 (03:27 -0800)
committerRichard Fairhurst <richard@systemeD.net>
Tue, 13 Nov 2012 11:27:55 +0000 (03:27 -0800)
Nightclub ref trac ticket 4025

1  2 
resources/map_features.xml patch | diff1 | diff2 | blob | history

diff --cc resources/map_features.xml
Simple merge
Potlatch 2