Branch: refs/heads/3.1
Home: https://github.com/Warzone2100/warzone2100
Commit: 99e6ab52dd6d4c8d0a22b66e049280e284cbf804
https://github.com/Warzone2100/warzone2100/commit/99e6ab52dd6d4c8d0a22b66e049280e284cbf804
Author: per <[email protected]>
Date: 2013-10-25 (Fri, 25 Oct 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Update changelog
(cherry picked from commit 6b0ceca623f710dc5444d35cb1e1fa7965ee684a)
Commit: 53bf0afaf4e6094a74b4048c5276e43b04e2fcac
https://github.com/Warzone2100/warzone2100/commit/53bf0afaf4e6094a74b4048c5276e43b04e2fcac
Author: per <[email protected]>
Date: 2013-10-25 (Fri, 25 Oct 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Update Changelog
(cherry picked from commit 8d015ad27b5317877b8b9ee8f69c1a291c9278e8)
Commit: 2a3a480b43c993de806e1fc5123cd8bf3aaebb8b
https://github.com/Warzone2100/warzone2100/commit/2a3a480b43c993de806e1fc5123cd8bf3aaebb8b
Author: per <[email protected]>
Date: 2013-10-27 (Sun, 27 Oct 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Move build fix in ChangeLog to correct location
Commit: 8f4adda206597754163f7400f9542512ae862d39
https://github.com/Warzone2100/warzone2100/commit/8f4adda206597754163f7400f9542512ae862d39
Author: vexed <[email protected]>
Date: 2013-10-27 (Sun, 27 Oct 2013)
Changed paths:
M 3rdparty/miniupnpc/Changelog.txt
M 3rdparty/miniupnpc/LICENSE
M 3rdparty/miniupnpc/Makefile.am
M 3rdparty/miniupnpc/README
M 3rdparty/miniupnpc/bsdqueue.h
M 3rdparty/miniupnpc/codelength.h
M 3rdparty/miniupnpc/connecthostport.c
M 3rdparty/miniupnpc/connecthostport.h
M 3rdparty/miniupnpc/declspec.h
M 3rdparty/miniupnpc/igd_desc_parse.c
M 3rdparty/miniupnpc/igd_desc_parse.h
M 3rdparty/miniupnpc/minisoap.c
M 3rdparty/miniupnpc/minisoap.h
M 3rdparty/miniupnpc/minissdpc.c
M 3rdparty/miniupnpc/minissdpc.h
M 3rdparty/miniupnpc/miniupnpc.c
M 3rdparty/miniupnpc/miniupnpc.h
M 3rdparty/miniupnpc/miniupnpcstrings.h
A 3rdparty/miniupnpc/miniupnpctypes.h
M 3rdparty/miniupnpc/miniwget.c
M 3rdparty/miniupnpc/miniwget.h
M 3rdparty/miniupnpc/minixml.c
M 3rdparty/miniupnpc/minixml.h
A 3rdparty/miniupnpc/portlistingparse.c
A 3rdparty/miniupnpc/portlistingparse.h
A 3rdparty/miniupnpc/receivedata.c
A 3rdparty/miniupnpc/receivedata.h
M 3rdparty/miniupnpc/upnpcommands.c
M 3rdparty/miniupnpc/upnpcommands.h
M 3rdparty/miniupnpc/upnperrors.c
M 3rdparty/miniupnpc/upnperrors.h
M 3rdparty/miniupnpc/upnpreplyparse.c
M 3rdparty/miniupnpc/upnpreplyparse.h
M lib/netplay/netplay.cpp
M lib/netplay/netplay.vcxproj
M lib/netplay/netplay.vcxproj.filters
M src/frontend.cpp
M src/multiint.cpp
Log Message:
-----------
Upgrade miniupnp to miniupnpc-1.8.20131007 *NOTE* mimiupnp source has been
modified so we can compile it without errors!
Fix UPnP so it actually works on windows & linux & most likely mac.
Add more information about UPnP progress in console.
closes ticket:4095
Commit: f6dea54529eebb74b2617cc8165466dab645cdf0
https://github.com/Warzone2100/warzone2100/commit/f6dea54529eebb74b2617cc8165466dab645cdf0
Author: vexed <[email protected]>
Date: 2013-10-27 (Sun, 27 Oct 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog
Commit: 1b14836f454a6e20b5cceab262a33f0e3659b7a3
https://github.com/Warzone2100/warzone2100/commit/1b14836f454a6e20b5cceab262a33f0e3659b7a3
Author: vexed <[email protected]>
Date: 2013-10-27 (Sun, 27 Oct 2013)
Changed paths:
M 3rdparty/miniupnpc/Changelog.txt
M 3rdparty/miniupnpc/LICENSE
M 3rdparty/miniupnpc/Makefile.am
M 3rdparty/miniupnpc/README
M 3rdparty/miniupnpc/bsdqueue.h
M 3rdparty/miniupnpc/codelength.h
M 3rdparty/miniupnpc/connecthostport.c
M 3rdparty/miniupnpc/connecthostport.h
M 3rdparty/miniupnpc/declspec.h
M 3rdparty/miniupnpc/igd_desc_parse.c
M 3rdparty/miniupnpc/igd_desc_parse.h
M 3rdparty/miniupnpc/minisoap.c
M 3rdparty/miniupnpc/minisoap.h
M 3rdparty/miniupnpc/minissdpc.c
M 3rdparty/miniupnpc/minissdpc.h
M 3rdparty/miniupnpc/miniupnpc.c
M 3rdparty/miniupnpc/miniupnpc.h
M 3rdparty/miniupnpc/miniupnpcstrings.h
A 3rdparty/miniupnpc/miniupnpctypes.h
M 3rdparty/miniupnpc/miniwget.c
M 3rdparty/miniupnpc/miniwget.h
M 3rdparty/miniupnpc/minixml.c
M 3rdparty/miniupnpc/minixml.h
A 3rdparty/miniupnpc/portlistingparse.c
A 3rdparty/miniupnpc/portlistingparse.h
A 3rdparty/miniupnpc/receivedata.c
A 3rdparty/miniupnpc/receivedata.h
M 3rdparty/miniupnpc/upnpcommands.c
M 3rdparty/miniupnpc/upnpcommands.h
M 3rdparty/miniupnpc/upnperrors.c
M 3rdparty/miniupnpc/upnperrors.h
M 3rdparty/miniupnpc/upnpreplyparse.c
M 3rdparty/miniupnpc/upnpreplyparse.h
M ChangeLog
M lib/netplay/netplay.cpp
M lib/netplay/netplay.vcxproj
M lib/netplay/netplay.vcxproj.filters
M src/frontend.cpp
M src/multiint.cpp
Log Message:
-----------
Merge branch 'bugfixes' into 3.1
Conflicts:
ChangeLog
Compare:
https://github.com/Warzone2100/warzone2100/compare/ff28f2123560...1b14836f454a
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
