Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 7e18c2a58a4c73941f4fdd6aba238e162f81f641
      
https://github.com/Warzone2100/warzone2100/commit/7e18c2a58a4c73941f4fdd6aba238e162f81f641
  Author: cybersphinx <chr....@gmx.net>
  Date:   2012-06-09 (Sat, 09 Jun 2012)

  Changed paths:
    M COPYING.NONGPL

  Log Message:
  -----------
  Update COPYING.NONGPL.

Closes #3533, refs #3534.


  Commit: d51cea925ba706b58b14ff66dd32f2ce133c1baa
      
https://github.com/Warzone2100/warzone2100/commit/d51cea925ba706b58b14ff66dd32f2ce133c1baa
  Author: cybersphinx <chr....@gmx.net>
  Date:   2012-06-09 (Sat, 09 Jun 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update ChangeLog.


  Commit: aca180e0e860f42206bc9be21d9e7a65638afbec
      
https://github.com/Warzone2100/warzone2100/commit/aca180e0e860f42206bc9be21d9e7a65638afbec
  Author: Christian Ohm <chr....@gmx.net>
  Date:   2012-06-09 (Sat, 09 Jun 2012)

  Changed paths:
    M COPYING.NONGPL
    M data/base/texpages/page-25-sky-urban.png

  Log Message:
  -----------
  New skybox for urban maps.

Closes #3534.


  Commit: c7e72b30e917459d15da0f9e2bda2ac23c16ab36
      
https://github.com/Warzone2100/warzone2100/commit/c7e72b30e917459d15da0f9e2bda2ac23c16ab36
  Author: safety0ff <safety...@users.sourceforge.net>
  Date:   2012-06-10 (Sun, 10 Jun 2012)

  Changed paths:
    M lib/ivis_opengl/piematrix.h
    M src/display3d.cpp

  Log Message:
  -----------
  Make sure we pop our matrix when returning from rendering functions in 
exceptional circumstances.


  Commit: 3928607fd9188f5147de396437a7367594949c33
      
https://github.com/Warzone2100/warzone2100/commit/3928607fd9188f5147de396437a7367594949c33
  Author: automerge <c...@wz2100.net>
  Date:   2012-06-10 (Sun, 10 Jun 2012)

  Changed paths:
    M COPYING.NONGPL
    M ChangeLog
    M data/base/texpages/page-25-sky-urban.png
    M lib/ivis_opengl/piematrix.h
    M src/display3d.cpp

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


Compare: https://github.com/Warzone2100/warzone2100/compare/d227d3a...3928607
------------------------------------------------------------------------------
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