0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged the changes in trunk from the last commit to 1.2,

Browse source 
...and the changes in 1.2 from the last commit to trunk.

[[Split portion of a mixed commit.]]
This commit is contained in:
Lari Nieminen 2006-07-07 22:03:03 +00:00
parent 1145285226
commit d2db707def
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/sound-utils.cfg
View file

@ -36,7 +36,7 @@ dwarf-hit-1.ogg,dwarf-hit-2.ogg,dwarf-hit-3.ogg,dwarf-hit-4.ogg #enddef
dwarf-die-1.ogg,dwarf-die-2.ogg #enddef
#define SOUND_LIST:ELF_HIT
elf-hit-1.ogg,elf-hit-2.ogg,elf-hit-3.ogg,elf-hit-4.ogg,elf-hit-5.ogg #enddef
elf-hit-1.ogg,elf-hit-2.ogg,elf-hit-3.ogg,elf-hit-4.ogg #enddef
#define SOUND_LIST:ELF_FEMALE_HIT
elf-female-hit-1.ogg,elf-female-hit-2.ogg,elf-female-hit-3.ogg,elf-female-hit-4.ogg,elf-female-hit-5.ogg #enddef