Merge remote-tracking branch 'origin/master' into 0.8.2-beta2

supertuxkart · Jan 20, 2015 · 0141a09 · 0141a09
2 parents 1142b77 + 21eace8
commit 0141a09
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 0 deletions.
diff --git a/data/fonts/StkChineseFont.xml b/data/fonts/StkChineseFont.xml
diff --git a/data/fonts/wqyMicroHei0.png b/data/fonts/wqyMicroHei0.png
diff --git a/data/fonts/wqyMicroHei1.png b/data/fonts/wqyMicroHei1.png
diff --git a/data/fonts/wqyMicroHei2.png b/data/fonts/wqyMicroHei2.png
diff --git a/data/fonts/wqyMicroHei3.png b/data/fonts/wqyMicroHei3.png
diff --git a/data/fonts/wqyMicroHei4.png b/data/fonts/wqyMicroHei4.png
diff --git a/data/fonts/wqyMicroHei5.png b/data/fonts/wqyMicroHei5.png
diff --git a/data/fonts/wqyMicroHei6.png b/data/fonts/wqyMicroHei6.png