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
							
						 
					 | 
					
						
						
						
						
							
						
						
							7763af389e
							
						
					 | 
					
						
						
							
							Added little l10n properties analysis tool, and fixed some obvious
						
						
						
						
						
						
						
						errors in cs & it localizations. 
						
						
					 | 
					
						2013-09-13 10:46:35 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruland2607
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e2f0966e5
							
						
					 | 
					
						
						
							
							Updated Italian translations.
						
						
						
						
						
						
					 | 
					
						2013-05-13 21:49:01 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sampo Niskanen
							
						 
					 | 
					
						
						
						
						
							
						
						
							525869c3e7
							
						
					 | 
					
						
						
							
							Refactoring or rocket configuration description
						
						
						
						
						
						
					 | 
					
						2013-03-22 18:12:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sampo Niskanen
							
						 
					 | 
					
						
						
						
						
							
						
						
							b3b2303f27
							
						
					 | 
					
						
						
							
							Enhance flight configuration UI
						
						
						
						
						
						
					 | 
					
						2013-01-27 22:36:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sampo Niskanen
							
						 
					 | 
					
						
						
						
						
							
						
						
							31ace7b312
							
						
					 | 
					
						
						
							
							Material localization support
						
						
						
						
						
						
					 | 
					
						2012-08-25 20:10:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Boris du Reau
							
						 
					 | 
					
						
						
						
						
							
						
						
							16d4378f94
							
						
					 | 
					
						
						
							
							Updated translations
						
						
						
						
						
						
					 | 
					
						2012-07-03 21:21:46 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Boris du Reau
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf0e3d978a
							
						
					 | 
					
						
						
							
							updated translations
						
						
						
						
						
						
					 | 
					
						2012-04-10 18:33:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Boris du Reau
							
						 
					 | 
					
						
						
						
						
							
						
						
							8e6a59e6ad
							
						
					 | 
					
						
						
							
							Initial version of the Italian translations
						
						
						
						
						
						
					 | 
					
						2012-01-17 22:02:18 +00:00 | 
					
					
						
						
							
							
							
						
					 |