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 'develop'	2019-10-19 23:06:08 -07:00
Compatibility	Delete .DS_Store	2019-08-31 13:11:59 +08:00
FX	2.5m SRBs	2019-10-18 21:15:49 -07:00
Localization	Merge branch 'develop'	2019-10-19 23:06:08 -07:00
Patches	Add 3.75m nosecone	2019-10-19 22:57:21 -07:00
PatchesLegacy	Add 2.5m engine colour variants	2019-10-19 15:48:19 -07:00
PatchesMH	Update 1.875m MH nosecone	2019-10-19 20:31:54 -07:00
Plugins	Remove debug messages from module	2019-09-12 12:02:05 -07:00
Sounds	Delete drill-start.wav	2019-06-29 13:43:56 -07:00
Versioning	Merge branch 'develop'	2019-10-19 23:06:08 -07:00
Restock.restockblacklist	Merge branch '1-8-updates' into develop	2019-10-19 15:54:09 -07:00