Alexander Allen
							
						 
					 | 
					
						
						
						
						
							
						
						
							107d987973
							
						
					 | 
					
						
						
							
							Implemented CD Override
						
						
						
						
						
						
					 | 
					
						2017-09-20 21:45:26 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kevin Ruland
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b4a7c74fc
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into unstable
						
						
						
						
						
						
						
						Conflicts:
	swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java 
						
						
					 | 
					
						2016-04-02 16:49:15 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Wes Cravens
							
						 
					 | 
					
						
						
						
						
							
						
						
							74d636bf33
							
						
					 | 
					
						
						
							
							Add concurrent mass info for both with and without motor configuration
						
						
						
						
						
						
					 | 
					
						2016-03-23 13:23:40 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel_M_Williams
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f4cba68ae
							
						
					 | 
					
						
						
							
							refactored RocketFigure to use RocketPanel.VIEW_TYPE enum instead of unchecked ints
						
						
						
						
						
						
					 | 
					
						2015-06-23 13:12:48 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruland2607
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d3e779488
							
						
					 | 
					
						
						
							
							Update PT translations.
						
						
						
						
						
						
					 | 
					
						2013-05-19 15:13:29 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruland2607
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6a8a94986
							
						
					 | 
					
						
						
							
							Updated ja & pt localization files for changed keys.  Updated ChangeLog
						
						
						
						
						
						
						
						and fileformat files. 
						
						
					 | 
					
						2013-04-17 12:50:56 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruland2607
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f9dc93705
							
						
					 | 
					
						
						
							
							Merge in l10n changes.
						
						
						
						
						
						
					 | 
					
						2013-04-16 13:53:17 -05:00 | 
					
					
						
						
							
							
							
						
					 |