Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 43bf1a8b30655d3037cf44d9f6e4963b01843bd7
      
https://github.com/Warzone2100/warzone2100/commit/43bf1a8b30655d3037cf44d9f6e4963b01843bd7
  Author: vexed <ve...@wz2100.net>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    M src/multiint.cpp

  Log Message:
  -----------
  Only need to show the UPnP stuff for Hosts.


  Commit: 4086e93c16a74491e3b6a58efb2df5e3714b0079
      
https://github.com/Warzone2100/warzone2100/commit/4086e93c16a74491e3b6a58efb2df5e3714b0079
  Author: vexed <ve...@wz2100.net>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M configure.ac
    A icons/wz2100headerP.bmp
    A icons/wz2100portable.ico
    A icons/wz2100portableU.ico
    A icons/wz2100welcomeP.bmp
    M lib/exceptionhandler/exchndl.cpp
    M lib/framework/i18n.cpp
    M pkg/nsis/Makefile.am
    M pkg/nsis/warzone2100.nsi
    M src/Makefile.am
    M src/main.cpp
    M win32/Makefile.am
    A win32/warzone2100_portable.rc

  Log Message:
  -----------
  Portable Warzone fixes for windows.
Fix windows paths.

Windows portable icon by forum member Duda.
Portable header & welcome images from forum member Aubergine.
Image fixes supplied by Berg.

Note: In configure stage (Windows only!), you can specify --enable-portable 
[default no] to
      create a portable installer. (That is, everything is self-contained in 
the directory
      you install Warzone 2100 to.  It will *not* use any other directory on 
the system.)
      If you pass --with-videos [default no], then it will add the videos with 
the portable
      installer and looks for the video file in \opt\sequences.wz

FIXME: Need: RUSSIAN, GERMAN, DUTCH, tranlations fixes for the warzone2100.nsi 
file.
(cherry picked from commit c1b29c1f5e6e6331ab5a96f27ba963192e709d81)

Conflicts:
        src/Makefile.am


  Commit: 854b22c77094f446e983ffeb7d4b4d3bc4ecc8dc
      
https://github.com/Warzone2100/warzone2100/commit/854b22c77094f446e983ffeb7d4b4d3bc4ecc8dc
  Author: vexed <ve...@wz2100.net>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M data/base/images/frontend.img
    A data/base/images/frontend/image_filter.png
    A data/base/images/frontend/image_filter_r.png
    A data/base/images/frontend/image_reload.png
    A data/base/images/frontend/image_reload_r.png
    M src/frend.h
    M src/multiint.cpp

  Log Message:
  -----------
  Add filter icon by duha
Add refresh icon by slate

Fix button states.


  Commit: 9f005d25a7a5f98258a2f3a39d9e6bffc4d3bbaf
      
https://github.com/Warzone2100/warzone2100/commit/9f005d25a7a5f98258a2f3a39d9e6bffc4d3bbaf
  Author: vexed <ve...@wz2100.net>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M data/base/images/frontend.img
    A data/base/images/frontend/image_filter.png
    A data/base/images/frontend/image_filter_r.png
    A data/base/images/frontend/image_reload.png
    A data/base/images/frontend/image_reload_r.png
    M src/Makefile.am
    M src/frend.h
    M src/multiint.cpp

  Log Message:
  -----------
  Merge branch 'bugfixes'

Conflicts:
        data/base/images/frontend.img
        src/Makefile.am
        src/frend.h
        src/multiint.cpp


Compare: 
https://github.com/Warzone2100/warzone2100/compare/3eda8704b89f...9f005d25a7a5
------------------------------------------------------------------------------
Android is increasing in popularity, but the open development platform that
developers love is also attractive to malware creators. Download this white
paper to learn more about secure code signing practices that can help keep
Android apps secure.
http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk
_______________________________________________
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

Reply via email to