Merge remote-tracking branch 'origin/master' into DEVELOP · UmbraSpaceIndustries/USI-LS@9f8f290 · GitHub

Commit

Merge remote-tracking branch 'origin/master' into DEVELOP

Browse files

# Conflicts:
#	GameData/UmbraSpaceIndustries/LifeSupport/Parts/Greenhouse.cfg
#	GameData/UmbraSpaceIndustries/LifeSupport/Parts/JumboGreenhouse.cfg
#	GameData/UmbraSpaceIndustries/LifeSupport/Parts/MiniPak_01.cfg
#	GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_250.cfg
#	GameData/UmbraSpaceIndustries/LifeSupport/Parts/Tank_375.cfg

Loading branch information

BobPalmer committed Nov 19, 2015

2 parents d96342f + 1444636 commit 9f8f290