Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 2ca39e5fc776019a6d5e315e674397a915f860bb
      
https://github.com/Warzone2100/warzone2100/commit/2ca39e5fc776019a6d5e315e674397a915f860bb
  Author: Cyp <c...@wz2100.net>
  Date:   2012-08-05 (Sun, 05 Aug 2012)

  Changed paths:
    M lib/ivis_opengl/bitimage.cpp

  Log Message:
  -----------
  Add header for std::sort.


  Commit: 552a60b099a5bc4a9b571056dde7afbf5723047c
      
https://github.com/Warzone2100/warzone2100/commit/552a60b099a5bc4a9b571056dde7afbf5723047c
  Author: Cyp <c...@wz2100.net>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    A data/base/images/frontend/image_no_lassat.png
    A data/base/images/frontend/image_no_uplink.png

  Log Message:
  -----------
  Add files missing from 1e5fafabb39f76762ab7a560be7770595bc60a8c.

Fixes ticket:3646.


  Commit: 4aa1ec1214ebf7912fc555894711c9d64985ae64
      
https://github.com/Warzone2100/warzone2100/commit/4aa1ec1214ebf7912fc555894711c9d64985ae64
  Author: cybersphinx <chr....@gmx.net>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    A data/base/images/frontend/image_no_lassat.png
    A data/base/images/frontend/image_no_uplink.png
    M lib/ivis_opengl/bitimage.cpp

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

* bugfixes:
  Add files missing from 1e5fafabb39f76762ab7a560be7770595bc60a8c.
  Add header for std::sort.


Compare: 
https://github.com/Warzone2100/warzone2100/compare/b63959268e62...4aa1ec1214eb
------------------------------------------------------------------------------
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
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

Reply via email to