Author: muggenhor
Date: Tue Oct 23 14:21:03 2007
New Revision: 2595
URL: http://svn.gna.org/viewcvs/warzone?rev=2595&view=rev
Log:
* Now finish the merge of r2347:2584 from trunk into sound branch for real!!!
* believe it or not but I have been capable of somehow causing two
invocations of "svn merge" on an identical working copy to yield *different*
results
* Revert the entire souce:branches/sound/src directory (the only directory
which was ''out of sync'') back to the same state as source:trunk/[EMAIL
PROTECTED]
* Replicate all changes of changeset:988/branches/sound/src
* ''Removed all #include directives which include from lib/sound/ and
replaced them with lib/sound/sound.h''
Added:
branches/sound/src/action.c
- copied, changed from r2584, trunk/src/action.c
branches/sound/src/hci.c
- copied, changed from r2584, trunk/src/hci.c
branches/sound/src/loadsave.c
- copied, changed from r2584, trunk/src/loadsave.c
branches/sound/src/multistruct.c
- copied, changed from r2584, trunk/src/multistruct.c
branches/sound/src/order.c
- copied, changed from r2584, trunk/src/order.c
_______________________________________________
Warzone-commits mailing list
Warzone-commits@gna.org
https://mail.gna.org/listinfo/warzone-commits
