Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...
authorShaun McDonald <shaun@shaunmcdonald.me.uk>
Thu, 25 Sep 2008 15:06:05 +0000 (15:06 +0000)
committerShaun McDonald <shaun@shaunmcdonald.me.uk>
Thu, 25 Sep 2008 15:06:05 +0000 (15:06 +0000)
commitd9e070e06956801aba2378c1b79b4d9f13ae12ee
tree9ddd0ec32b540a62882ae0a18a41973de9a9dae6
parent87494900df0f40c734286139678d347af9c234b7
parentc2854a8056a19219d4ecd4e29099f2ef6224f2d0
Doing a resync from mainline 8633:10895. There was one simple to resolve conflict on app/models/node.rb. Also moving the migrations for API0.6 to new sequence numbers since there was some new migrations added to mainline, where the migration numbers would conflict if not moved.
16 files changed:
app/controllers/api_controller.rb
app/controllers/application.rb
app/models/node.rb
app/models/old_way.rb
app/models/relation.rb
app/models/way.rb
config/environment.rb
config/routes.rb
db/migrate/016_add_timestamp_indexes.rb
db/migrate/017_populate_node_tags_and_remove.rb
db/migrate/017_populate_node_tags_and_remove_helper.c
db/migrate/018_move_to_innodb.rb
db/migrate/019_key_constraints.rb
db/migrate/020_add_changesets.rb
lib/geo_record.rb
lib/osm.rb