[Warzone2100-commits] [Warzone2100/warzone2100] 9575cf: Allow setting/clearing game password after game is...

2012-09-07 Thread automerge
  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 9575cf93e2a0b39c11d7bd2f51aef100fe4dae57
  
https://github.com/Warzone2100/warzone2100/commit/9575cf93e2a0b39c11d7bd2f51aef100fe4dae57
  Author: Cyp c...@wz2100.net
  Date:   2012-09-03 (Mon, 03 Sep 2012)

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

  Log Message:
  ---
  Allow setting/clearing game password after game is hosted.

Also, if typing password and pressing Enter, actually set the password.


  Commit: 5c219f8d855db0e9bbe65c690d1f6177a603ef8c
  
https://github.com/Warzone2100/warzone2100/commit/5c219f8d855db0e9bbe65c690d1f6177a603ef8c
  Author: Cyp c...@wz2100.net
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
M src/multimenu.cpp

  Log Message:
  ---
  Display debug build net usage meter at bottom of player window, independently 
of player window size.

Text no longer covers player 8.

Only affects debug builds.


  Commit: af649f85fe7e1ee9aa983d3b8e11d59595573561
  
https://github.com/Warzone2100/warzone2100/commit/af649f85fe7e1ee9aa983d3b8e11d59595573561
  Author: automerge c...@wz2100.net
  Date:   2012-09-06 (Thu, 06 Sep 2012)

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

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


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


[Warzone2100-commits] [Warzone2100/warzone2100] 9575cf: Allow setting/clearing game password after game is...

2012-09-03 Thread Cyp
  Branch: refs/heads/bugfixes
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 9575cf93e2a0b39c11d7bd2f51aef100fe4dae57
  
https://github.com/Warzone2100/warzone2100/commit/9575cf93e2a0b39c11d7bd2f51aef100fe4dae57
  Author: Cyp c...@wz2100.net
  Date:   2012-09-03 (Mon, 03 Sep 2012)

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

  Log Message:
  ---
  Allow setting/clearing game password after game is hosted.

Also, if typing password and pressing Enter, actually set the password.



--
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