Merge branch 'master' of https://github.com/q3shafe/trepidation

q3shafe · Mar 15, 2019 · 162e007 · 162e007
2 parents 29fa179 + 94013e6
commit 162e007
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 0 deletions.
diff --git a/game-media/pak0-gpl2data/maps/oa_rpg3dm2_s.bsp b/game-media/pak0-gpl2data/maps/oa_rpg3dm2_s.bsp
diff --git a/game-media/pak0-gpl2data/textures/base_floor/pewter_merge.jpg b/game-media/pak0-gpl2data/textures/base_floor/pewter_merge.jpg
diff --git a/game-media/pak0-gpl2data/textures/holodeck_training/lava2.jpg b/game-media/pak0-gpl2data/textures/holodeck_training/lava2.jpg
diff --git a/game-media/pak0-gpl2data/textures/holodeck_training/lava2_mult.jpg b/game-media/pak0-gpl2data/textures/holodeck_training/lava2_mult.jpg
diff --git a/game-media/pak0-gpl2data/textures/holodeck_training/lavaz.jpg b/game-media/pak0-gpl2data/textures/holodeck_training/lavaz.jpg
diff --git a/game-media/pak0-gpl2data/textures/holodeck_training/lavaz_mult.jpg b/game-media/pak0-gpl2data/textures/holodeck_training/lavaz_mult.jpg
diff --git a/game-media/pak1-ccdata/maps/ctf_junction_2.aas b/game-media/pak1-ccdata/maps/ctf_junction_2.aas
diff --git a/game-media/pak1-ccdata/maps/ctf_junction_2.bsp b/game-media/pak1-ccdata/maps/ctf_junction_2.bsp