archives/freedoom
2
0
Fork 0
mirror of https://github.com/freedoom/freedoom.git synced 2025-09-02 07:25:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'double_impact'

Browse source 
Conflicts:
	graphics/text/config.py
	lumps/fraggle/freedoom.bex
This commit is contained in:
RjY 2013-12-18 12:20:45 +00:00
commit 2aaad3eea8
31 changed files with 99 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
graphics/text/config.py
View file

@ -102,7 +102,7 @@ red_graphics = {
'm_epi1': 'First Episode',
'm_epi2': 'Second Episode',
'm_epi3': 'Third Episode',
'm_epi4': 'Fourth Episode',
'm_epi4': 'Double Impact',
'm_jkill': 'Please don\'t kill me!',
'm_rough': 'Will this hurt?',