Merge remote-tracking branch 'upstream/master'

97962607 · Sryder · 1ab29ba9 · a721528c · 1ab29ba9 · 1ab29ba9
Commit 97962607 authored 10 years ago by Sryder
--- a/doc/manual/1up.png
+++ b/doc/manual/1up.png
--- a/doc/manual/RNGA0000.png
+++ b/doc/manual/RNGA0000.png
--- a/doc/manual/RNGB0000.png
+++ b/doc/manual/RNGB0000.png
--- a/doc/manual/RNGE0000.png
+++ b/doc/manual/RNGE0000.png
--- a/doc/manual/RNGG0000.png
+++ b/doc/manual/RNGG0000.png
--- a/doc/manual/RNGR0000.png
+++ b/doc/manual/RNGR0000.png
--- a/doc/manual/RNGS0000.png
+++ b/doc/manual/RNGS0000.png
--- a/doc/manual/Ring0000.png
+++ b/doc/manual/Ring0000.png
--- a/doc/manual/acz.png
+++ b/doc/manual/acz.png
--- a/doc/manual/airspin.png
+++ b/doc/manual/airspin.png
--- a/doc/manual/attack.png
+++ b/doc/manual/attack.png
--- a/doc/manual/blue_monitor.png
+++ b/doc/manual/blue_monitor.png
--- a/doc/manual/blue_ring.png
+++ b/doc/manual/blue_ring.png
--- a/doc/manual/bshield.png
+++ b/doc/manual/bshield.png
--- a/doc/manual/cez.png
+++ b/doc/manual/cez.png
--- a/doc/manual/controls.png
+++ b/doc/manual/controls.png
--- a/doc/manual/conveyor.png
+++ b/doc/manual/conveyor.png
--- a/doc/manual/coop.png
+++ b/doc/manual/coop.png
--- a/doc/manual/crusher.png
+++ b/doc/manual/crusher.png
--- a/doc/manual/ctf.png
+++ b/doc/manual/ctf.png