drewcassidy 14bc904f41 Merge branch 'master' into develop		2019-05-10 18:32:08 -07:00
..
Assets	Fix battery holes	2019-03-07 08:27:21 -08:00
FX	Fix dds issues	2019-02-27 09:45:43 -08:00
Localization	Catch up to Master	2019-03-24 18:15:38 -07:00
Parts	Merge branch 'master' into develop	2019-05-10 18:32:08 -07:00
Patches	Comment Science Satellite Contracts config adequately	2019-03-17 17:50:13 +00:00
Versioning	Update RCS mass/cost for 1.7	2019-04-12 10:15:05 -07:00