Merge remote-tracking branch 'upstream/master'

2019-04-30 09:19:38 -05:00
parent 35f31f7a7c 97e910b7c9
commit efc61b5940
8 changed files with 0 additions and 0 deletions
--- a/appearance/frn_all_painting_posters_jawa.apt
+++ b/appearance/frn_all_painting_posters_jawa.apt
--- a/appearance/frn_all_painting_posters_yacht.apt
+++ b/appearance/frn_all_painting_posters_yacht.apt
--- a/appearance/mesh/frn_all_painting_posters_jawa.msh
+++ b/appearance/mesh/frn_all_painting_posters_jawa.msh
--- a/appearance/mesh/frn_all_painting_posters_yacht.msh
+++ b/appearance/mesh/frn_all_painting_posters_yacht.msh
--- a/datatables/space/ship_chassis_player_arc170.iff
+++ b/datatables/space/ship_chassis_player_arc170.iff
--- a/datatables/space/ship_chassis_player_awing.iff
+++ b/datatables/space/ship_chassis_player_awing.iff
--- a/texture/frn_all_painting_posters_jawa.dds
+++ b/texture/frn_all_painting_posters_jawa.dds
--- a/texture/frn_all_painting_posters_yacht.dds
+++ b/texture/frn_all_painting_posters_yacht.dds