ChrisAdderley 2bb4e594dc Merge branch 'develop' ... # Conflicts: # Distribution/Restock/GameData/ReStock/Restock.restockblacklist # Distribution/Restock/changelog.txt # Distribution/Restock/readme.txt # Distribution/RestockPlus/changelog.txt # Distribution/RestockPlus/readme.txt		2019-10-19 23:06:08 -07:00
..
Assets	Merge branch '1-8-updates' into develop	2019-10-19 15:54:09 -07:00
FX	Move srb-tiny-core-1 fx into restock core for LES	2019-09-12 22:56:19 -07:00
Localization	Merge branch 'develop'	2019-10-19 23:06:08 -07:00
Parts	Add 3.75m nosecone	2019-10-19 22:57:21 -07:00
Patches	Merge branch 'ground' into develop	2019-10-09 17:52:33 -07:00
Versioning	Merge branch 'develop'	2019-10-19 23:06:08 -07:00