git.openstreetmap.org Git - rails.git/commit

]> git.openstreetmap.org Git - rails.git/commit

projects / rails.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a4de927 80c6c68)

author	Tom Hughes <tom@compton.nu>
	Thu, 16 Apr 2009 21:11:12 +0000 (21:11 +0000)
committer	Tom Hughes <tom@compton.nu>
	Thu, 16 Apr 2009 21:11:12 +0000 (21:11 +0000)
commit	5449cf4adcc1fad4b9f43426e6d3e4a8f65e6fbb
tree	44b460ef0d803777c939206f8936c2281bcc489f	tree \| snapshot
parent	a4de927a2800e0fc739460cee5a71e58d09d25f9	commit \| diff
parent	80c6c685bcf097754e872ba61444fc4bb93f2515	commit \| diff

Merge 14394:14533 from trunk.

16 files changed:

app/controllers/amf_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/api_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/application.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/browse_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/diary_entry_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/message_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/node_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/old_node_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/old_way_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/relation_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/trace_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/user_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/way_controller.rb	diff1 \|	diff2 \|	blob \| history
app/views/layouts/site.rhtml	diff1 \|	diff2 \|	blob \| history
app/views/site/edit.rhtml	diff1 \|	diff2 \|	blob \| history
config/environment.rb	diff1 \|	diff2 \|	blob \| history

The OpenStreetMap web site