Merge 15165:15373 from trunk.
authorTom Hughes <tom@compton.nu>
Sun, 31 May 2009 11:32:32 +0000 (11:32 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 31 May 2009 11:32:32 +0000 (11:32 +0000)
commit3d906fe8c6303c00e399ce2dfecc3471959fbe6e
tree5c28dfa6b06ef8a7e9851c3027bf5fae241669b6
parente9bea64bf6806be1b0a951fd684fa13314cb8b67
Merge 15165:15373 from trunk.
25 files changed:
app/controllers/amf_controller.rb
app/controllers/browse_controller.rb
app/controllers/way_controller.rb
app/models/old_relation.rb
app/models/old_way.rb
app/models/relation.rb
app/views/browse/_node_details.rhtml
app/views/browse/_tag.rhtml
app/views/browse/_way_details.rhtml
app/views/changeset/_changeset.rhtml
app/views/export/start.rjs
app/views/layouts/site.rhtml
config/initializers/action_mailer.rb
config/initializers/load_configs.rb
config/lighttpd.conf
config/text_outputs/en.yml [deleted file]
db/migrate/005_tile_tracepoints.rb
db/migrate/006_tile_nodes.rb
lib/map_boundary.rb
lib/osm.rb
public/images/sotm.png [new file with mode: 0644]
public/javascripts/site.js
public/potlatch/potlatch.swf
public/stylesheets/site.css
test/functional/relation_controller_test.rb