Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: e90f7761685a51807af1f62ed717c03bb950373f
      
https://github.com/Warzone2100/warzone2100/commit/e90f7761685a51807af1f62ed717c03bb950373f
  Author: vexed <[email protected]>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M lib/netplay/netplay.cpp

  Log Message:
  -----------
  Revert "Fix reported [-Werror=format] issue."

This reverts commit 0bfee185a38c1a354c14b33a064d13d81a03962f.


  Commit: c9fa97ca809c43b4a411ea41b9e1ea2bba114c7c
      
https://github.com/Warzone2100/warzone2100/commit/c9fa97ca809c43b4a411ea41b9e1ea2bba114c7c
  Author: vexed <[email protected]>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M lib/netplay/netplay.cpp
    M lib/netplay/netplay.h
    M src/multiint.cpp

  Log Message:
  -----------
  Revert "Add last part of net patch (needs updated server code)."

This reverts commit 329572779ae2e383b6bd668078ee4ecffe173dc4.


  Commit: 5b9a496b1a5dd3f1d63e0f035561bd750266d2da
      
https://github.com/Warzone2100/warzone2100/commit/5b9a496b1a5dd3f1d63e0f035561bd750266d2da
  Author: Cyp <[email protected]>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M lib/ivis_opengl/bitimage.cpp

  Log Message:
  -----------
  Use std::multiset::iterator instead of std::set::iterator with std::multiset.

Apparently, the iterators were compatible, in some library implementations.


  Commit: 7344958ab39e106287374dfecaf8b2a0469a36c2
      
https://github.com/Warzone2100/warzone2100/commit/7344958ab39e106287374dfecaf8b2a0469a36c2
  Author: automerge <[email protected]>
  Date:   2012-08-12 (Sun, 12 Aug 2012)

  Changed paths:
    M lib/ivis_opengl/bitimage.cpp
    M lib/netplay/netplay.cpp
    M lib/netplay/netplay.h
    M src/multiint.cpp

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


Compare: 
https://github.com/Warzone2100/warzone2100/compare/385b16f41387...7344958ab39e
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

Reply via email to