adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Oops. Remove leftover of merge conflict.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2552 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2006-11-27 22:26:08 +00:00
parent 7762b1aab0
commit 634c7a10dc
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
-1
View File
@@ -1,7 +1,6 @@
Changes towards version 0.6: Changes towards version 0.6:
- Unix build scripts improvements. - SvdB - Unix build scripts improvements. - SvdB
- Build fixes for MacOS X (with thanks to Nic) - SvdB - Build fixes for MacOS X (with thanks to Nic) - SvdB
=======
- Ships in battle can resume normal speed in all circumstances after - Ships in battle can resume normal speed in all circumstances after
the enemy Avatar's tractor beam disengages (bug #860; this is a the enemy Avatar's tractor beam disengages (bug #860; this is a
netplay desynchronizing change) - Alex netplay desynchronizing change) - Alex