Merge branch 'master' into openstreetbugs

Browse source

Conflicts:
	Gemfile
	app/helpers/application_helper.rb
	app/views/site/index.html.erb

...

This commit is contained in:

Tom Hughes 2012-09-20 16:01:24 +01:00

parent ea63736b5c 5c39e5870d

commit 4d91fe3dd9

177 changed files with 4914 additions and 3062 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

app/assets/images/key/osmarender/admin.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 234 B

BIN

app/assets/images/key/osmarender/allotments.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 114 B

BIN

app/assets/images/key/osmarender/bridleway.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 151 B

BIN

app/assets/images/key/osmarender/brownfield.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 111 B

BIN

app/assets/images/key/osmarender/building.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 114 B

BIN

app/assets/images/key/osmarender/byway.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 209 B

BIN

app/assets/images/key/osmarender/cemetery.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 148 B

BIN

app/assets/images/key/osmarender/centre.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 114 B

BIN

app/assets/images/key/osmarender/commercial.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 114 B

BIN

app/assets/images/key/osmarender/common.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 114 B

BIN

app/assets/images/key/osmarender/cycleway.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 130 B

BIN

app/assets/images/key/osmarender/farm.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 114 B

BIN

app/assets/images/key/osmarender/footway.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 131 B

BIN

app/assets/images/key/osmarender/forest.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 102 B

BIN

app/assets/images/key/osmarender/heathland.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 113 B

BIN

app/assets/images/key/osmarender/industrial.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 111 B

BIN

app/assets/images/key/osmarender/lake.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 105 B

BIN

app/assets/images/key/osmarender/mapkey.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 6.1 KiB

BIN

app/assets/images/key/osmarender/military.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 299 B

BIN

app/assets/images/key/osmarender/motorway.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 153 B

BIN

app/assets/images/key/osmarender/park.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 114 B

BIN

app/assets/images/key/osmarender/pitch.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 114 B

BIN

app/assets/images/key/osmarender/primary.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 116 B

BIN

app/assets/images/key/osmarender/rail.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 142 B

BIN

app/assets/images/key/osmarender/reserve.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 305 B

BIN

app/assets/images/key/osmarender/resident.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 105 B

BIN

app/assets/images/key/osmarender/retail.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 111 B

BIN

app/assets/images/key/osmarender/school.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 375 B

BIN

app/assets/images/key/osmarender/secondary.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 116 B

BIN

app/assets/images/key/osmarender/station.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 128 B

BIN

app/assets/images/key/osmarender/subway.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 128 B

BIN

app/assets/images/key/osmarender/summit.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 139 B

BIN

app/assets/images/key/osmarender/tourist.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 105 B

BIN

app/assets/images/key/osmarender/track.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 178 B

BIN

app/assets/images/key/osmarender/tram.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 151 B

BIN

app/assets/images/key/osmarender/trunk.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 116 B

BIN

app/assets/images/key/osmarender/unsurfaced.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 186 B

BIN

app/assets/images/key/osmarender/wood.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 102 B

BIN

app/assets/images/sotm.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 13 KiB

BIN

app/assets/images/sotmpdx.png Executable file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.1 KiB