Menu
▾
▴
[Armagetronad-commits] SF.net SVN: armagetronad:[10883] armagetronad/branches/0.4/
|
From: <z-...@us...> - 2016-11-29 22:47:29
|
Revision: 10883
http://sourceforge.net/p/armagetronad/code/10883
Author: z-man
Date: 2016-11-29 22:47:27 +0000 (Tue, 29 Nov 2016)
Log Message:
-----------
Merging branch 0.2.8 from revision 10876 to 10882:
------------------------------------------------------------------------
r10882 | z-man | 2016-11-29 23:46:04 +0100 (Di, 29 Nov 2016) | 8 lines
Merging branch 0.2.8.3 from revision 10875 to 10881:
------------------------------------------------------------------------
r10881 | z-man | 2016-11-29 23:44:21 +0100 (Di, 29 Nov 2016) | 2 lines
applying f-thiessen@launchpad's null derefernce crashfix. Dammit. We already had this in 0.4, why not here?
(Not merged, already here)
------------------------------------------------------------------------
------------------------------------------------------------------------
Revision Links:
--------------
http://sourceforge.net/p/armagetronad/code/10876
http://sourceforge.net/p/armagetronad/code/10882
http://sourceforge.net/p/armagetronad/code/10875
http://sourceforge.net/p/armagetronad/code/10881
Property Changed:
----------------
armagetronad/branches/0.4/
Index: armagetronad/branches/0.4
===================================================================
--- armagetronad/branches/0.4 2016-11-29 22:46:04 UTC (rev 10882)
+++ armagetronad/branches/0.4 2016-11-29 22:47:27 UTC (rev 10883)
Property changes on: armagetronad/branches/0.4
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
-/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10876
-/armagetronad/branches/0.2.8.3:9309-10505,10724-10875
+/armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-10044,10054-10532,10656-10661,10781-10882
+/armagetronad/branches/0.2.8.3:9309-10505,10724-10881
/armagetronad/tags/0.2.8.3.3_rc1:10715-10716
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|