Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 9a1e472e42db8bdc68de60e81c96e7b94042f16a
      
https://github.com/Warzone2100/warzone2100/commit/9a1e472e42db8bdc68de60e81c96e7b94042f16a
  Author: vexed <ve...@wz2100.net>
  Date:   2013-10-27 (Sun, 27 Oct 2013)

  Changed paths:
    M src/multiint.cpp

  Log Message:
  -----------
  Only display the UPnP messages for MP games, not for skirmish.


  Commit: 992113d98ccaba7e9d17e6a917da31214f9c44e3
      
https://github.com/Warzone2100/warzone2100/commit/992113d98ccaba7e9d17e6a917da31214f9c44e3
  Author: dak180 <dak...@users.sourceforge.net>
  Date:   2013-10-27 (Sun, 27 Oct 2013)

  Changed paths:
    M macosx/Warzone.xcodeproj/project.pbxproj

  Log Message:
  -----------
  Fix the mac build for 8f4adda2.

Refs. ticket:4095.


  Commit: dc7c28bdfb90b3a812aed3ed2bdb1afdb8ee5d30
      
https://github.com/Warzone2100/warzone2100/commit/dc7c28bdfb90b3a812aed3ed2bdb1afdb8ee5d30
  Author: vexed <ve...@wz2100.net>
  Date:   2013-10-27 (Sun, 27 Oct 2013)

  Changed paths:
    M src/multiint.cpp

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

Conflicts:
        src/multiint.cpp


  Commit: 1c5e5739e0c85310b19eee8a8f5d24301390f9d8
      
https://github.com/Warzone2100/warzone2100/commit/1c5e5739e0c85310b19eee8a8f5d24301390f9d8
  Author: vexed <ve...@wz2100.net>
  Date:   2013-10-27 (Sun, 27 Oct 2013)

  Changed paths:
    M macosx/Warzone.xcodeproj/project.pbxproj

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


Compare: 
https://github.com/Warzone2100/warzone2100/compare/2f217ab60297...1c5e5739e0c8
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60135991&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