[Warzone2100-commits] [Warzone2100/warzone2100] 439ac9: Remove comment missed in the last commit.

[<no...@gi...>]

Branch: refs/heads/2.3
Home:   https://github.com/Warzone2100/warzone2100

Commit: 439ac929297a0b49e881c5993145f964c8bed506
    https://github.com/Warzone2100/warzone2100/commit/439ac929297a0b49e881c5993145f964c8bed506
Author: cybersphinx <ch...@gm...>
Date:   2011-05-14 (Sat, 14 May 2011)

Changed paths:
  M lib/framework/i18n.c

Log Message:
-----------
Remove comment missed in the last commit.


Commit: 53302ea6a87828dcefa685eec23697f1ff761eff
    https://github.com/Warzone2100/warzone2100/commit/53302ea6a87828dcefa685eec23697f1ff761eff
Author: cybersphinx <ch...@gm...>
Date:   2011-05-14 (Sat, 14 May 2011)

Changed paths:
  M src/loop.c

Log Message:
-----------
Don't reload backdrop between videos.

Closes #2701.


Commit: 6676760c9580a365d0be1e1cfea53df1aea95c26
    https://github.com/Warzone2100/warzone2100/commit/6676760c9580a365d0be1e1cfea53df1aea95c26
Author: cybersphinx <ch...@gm...>
Date:   2011-05-14 (Sat, 14 May 2011)

Changed paths:
  M configure.ac
  M doc/Makefile.am

Log Message:
-----------
Make docs generation properly depend on a2x and wkhtmltopdf availability.


Commit: 8d386540c8aabdd7303290fb681933a6b5e9bd8a
    https://github.com/Warzone2100/warzone2100/commit/8d386540c8aabdd7303290fb681933a6b5e9bd8a
Author: cybersphinx <ch...@gm...>
Date:   2011-05-14 (Sat, 14 May 2011)

Changed paths:
  M lib/ivis_common/textdraw.h
  M lib/ivis_opengl/textdraw.c
  M src/loop.c
  M src/seqdisp.c
  M src/seqdisp.h

Log Message:
-----------
Merge branch 't/2.3/sequencestuff' into 2.3


Commit: 840ba8fd17729aae3f7f9d935d644a021ea6cbfa
    https://github.com/Warzone2100/warzone2100/commit/840ba8fd17729aae3f7f9d935d644a021ea6cbfa
Author: cybersphinx <ch...@gm...>
Date:   2011-05-14 (Sat, 14 May 2011)

Changed paths:
  M .gitignore
  M COMPILE
  M configure.ac
  M doc/Makefile.am
  R doc/Readme.de
  R doc/Readme.de.xhtml
  R doc/Readme.en.xhtml
  A doc/docbook-xsl.css
  A doc/images/artillery-far-away.jpg
  A doc/images/artillery-sensor.jpg
  A doc/images/attackrange.jpg
  A doc/images/awaymission.jpg
  A doc/images/building-select.jpg
  A doc/images/building.jpg
  A doc/images/cb-sensor-vtol.png
  A doc/images/cb-sensor.png
  A doc/images/cheapweapon.png
  A doc/images/commander-factory-assignment.jpg
  A doc/images/commander-panel.jpg
  A doc/images/commander.png
  A doc/images/commandpanel.png
  A doc/images/design-bars.jpg
  A doc/images/design-more.png
  A doc/images/design-screen.jpg
  A doc/images/design-unit.jpg
  A doc/images/design.jpg
  A doc/images/expensiveweapon.png
  A doc/images/firing.jpg
  A doc/images/hq.png
  A doc/images/indirect-fire-support.jpg
  A doc/images/intelligencedisplay.jpg
  A doc/images/interface.jpg
  A doc/images/logo.png
  A doc/images/manufacture-select.jpg
  A doc/images/manufacture.jpg
  A doc/images/minimap.jpg
  A doc/images/movement.jpg
  A doc/images/oilresource.jpg
  A doc/images/powerbar.jpg
  A doc/images/powerupgrade.png
  A doc/images/rallypoints.jpg
  A doc/images/recycling.jpg
  A doc/images/research-select.jpg
  A doc/images/research.jpg
  A doc/images/retreatthreshold.jpg
  A doc/images/return.jpg
  A doc/images/satellite-uplink.png
  A doc/images/sensor-tower.png
  A doc/images/sensor.png
  A doc/images/transport.jpg
  A doc/images/unitordersmenu.jpg
  A doc/images/wss.png
  A doc/images/www.png
  A doc/quickstartguide.asciidoc
  R doc/styles/readme.print.css
  R doc/styles/readme.screen.css
  R doc/styles/scriptingmanual.css
  A doc/warzone2100.6.asciidoc
  M pkg/dpkg/control
  M pkg/dpkg/rules
  R pkg/dpkg/warzone2100.6
  M pkg/dpkg/warzone2100.install
  M pkg/nsis/warzone2100.nsi

Log Message:
-----------
Merge branch 't/2.3/docs' into 2.3

Closes #1298.


Compare: https://github.com/Warzone2100/warzone2100/compare/3234b9c...840ba8f