Merge branch 'master' of ssh://git.code.sf.net/p/freecs-1-5/code
# Conflicts: # rewolf_demo.fmf # scihunt.fmf # tfc.fmf # valve_dayone.fmf # valve_uplink.fmf
This commit is contained in:
commit
bf48be3650
2 changed files with 4 additions and 1 deletions
4
tfc.fmf
4
tfc.fmf
|
@ -1,8 +1,12 @@
|
|||
FTEMANIFEST 1
|
||||
GAME tfc
|
||||
NAME "Team Fortress"
|
||||
<<<<<<< HEAD
|
||||
BASEGAME platform
|
||||
BASEGAME logos
|
||||
=======
|
||||
BASEGAME nuclide
|
||||
>>>>>>> 0246a10b124be549d1bdbce3a96c8619ad29c9ec
|
||||
BASEGAME tfc
|
||||
|
||||
// custom game menu variables
|
||||
|
|
|
@ -23,7 +23,6 @@ BASEGAME valve_uplink
|
|||
-set gameinfo_hlversion "1110"
|
||||
-set gameinfo_svonly "0"
|
||||
|
||||
// download/update packaging information
|
||||
UPDATEURL http://www.frag-net.com/mods/valve_uplink.fmf
|
||||
PACKAGE valve_uplink/pak0.pk3 0xc8ed1ea1 "http://www.frag-net.com/dl/c8ed1ea1/file.pk3"
|
||||
PACKAGE logos/pakrm_logos.pk3 0xd318299 "http://www.frag-net.com/dl/d318299/file.pk3"
|
||||
|
|
Loading…
Reference in a new issue