Merge branch 'master' into jgrpp

# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h

src/tile_map.h

@@ -40,8 +40,8 @@ static inline uint TileHeight(TileIndex tile)
 /**
  * Returns the height of a tile, also for tiles outside the map (virtual "black" tiles).
  *
- * @param x X coordinate of the tile, may be ouside the map.
- * @param y Y coordinate of the tile, may be ouside the map.
+ * @param x X coordinate of the tile, may be outside the map.
+ * @param y Y coordinate of the tile, may be outside the map.
  * @return The height in the same unit as TileHeight.
  */
 static inline uint TileHeightOutsideMap(int x, int y)
@@ -82,8 +82,8 @@ static inline uint TilePixelHeight(TileIndex tile)
 /**
  * Returns the height of a tile in pixels, also for tiles outside the map (virtual "black" tiles).
  *
- * @param x X coordinate of the tile, may be ouside the map.
- * @param y Y coordinate of the tile, may be ouside the map.
+ * @param x X coordinate of the tile, may be outside the map.
+ * @param y Y coordinate of the tile, may be outside the map.
  * @return The height in pixels in the same unit as TilePixelHeight.
  */
 static inline uint TilePixelHeightOutsideMap(int x, int y)