Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Drullkus committed 2015-01-11 13:21:40 -08:00
commit 1ec6bfddbe
5 files changed
+26 -9

No files matched your search

@@ -547,7 +547,10 @@ tile.concrete.9.desc=Partly Weathered Concrete Block
tile.concrete.10.desc=Asphalt
#Road Line
tile.roadLine.name=Road Lines
tile.roadLine.name=Road Lines (White)
tile.roadLine1.name=Road Lines (Double White)
tile.roadLine2.name=Road Lines (Yellow)
tile.roadLine3.name=Road Lines (Double Yellow)
#Iron Blocks
tile.iron_block.name=Iron Block
Binary file not shown.

Before

Width:  |  Height:  |  Size: 717 B

After

Width:  |  Height:  |  Size: 3.3 KiB