Merge branch 'master' into jgrpp

2016-05-13 00:25:10 +01:00
parent f6d374ade4 bd71bcc616
commit 4c0423d6d8
19 changed files with 150 additions and 142 deletions
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -604,7 +604,7 @@ TextEffectID ShowFillingPercent(int x, int y, int z, uint8 percent, StringID str
 /**
 * Update vehicle loading indicators.
 * @param te_id   TextEffectID to be updated.
- * @param string  String wich is printed.
+ * @param string  String which is printed.
 */
 void UpdateFillingPercent(TextEffectID te_id, uint8 percent, StringID string)
 {