Daniel_M_Williams 
							
						 
					 
					
						
						
						
						
							
						
						
							9034b23386 
							
						 
					 
					
						
						
							
							[add] Added */.DS_Store to .gitignore file  
						
						 
						
						
						
						
					 
					
						2016-12-20 12:47:48 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wes Cravens 
							
						 
					 
					
						
						
						
						
							
						
						
							e2efefb296 
							
						 
					 
					
						
						
							
							IntelliJ CE integration and build  
						
						 
						
						
						
						
					 
					
						2016-03-23 17:15:26 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							d692288f68 
							
						 
					 
					
						
						
							
							Added build.xml driver in root directory.  Moved a few files around to support  
						
						 
						
						... 
						
						
						
						unittest. 
						
						
					 
					
						2013-09-30 11:38:54 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruland2607 
							
						 
					 
					
						
						
						
						
							
						
						
							26fb295554 
							
						 
					 
					
						
						
							
							Rework source structure to separate swing gui code from core code.  
						
						 
						
						... 
						
						
						
						Separate swing application code from core code.  Moved a bunch of sources
and libraries around.  Created new eclipse project.
Further refinements to make it build.
Update gitignore. 
						
						
					 
					
						2013-09-27 11:34:46 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							5412b8255b 
							
						 
					 
					
						
						
							
							Merge branch 'integration' of github.com:kruland2607/openrocket  
						
						 
						
						... 
						
						
						
						Conflicts:
	core/.classpath
	core/3d-Test-Junk/net/sf/openrocket/startup/Quick3dMain.java
	core/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java
	core/src/net/sf/openrocket/gui/main/BasicFrame.java 
						
						
					 
					
						2012-12-11 08:38:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							49858f589f 
							
						 
					 
					
						
						
							
							Update thrust curve files  
						
						 
						
						
						
						
					 
					
						2012-12-10 23:30:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								batwings 
							
						 
					 
					
						
						
						
						
							
						
						
							5d65b591e1 
							
						 
					 
					
						
						
							
							Merge branch 'feature-rocketconfig' into integration  
						
						 
						
						... 
						
						
						
						Conflicts:
	core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
	core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java 
						
						
					 
					
						2012-10-24 09:26:29 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							640cbc1179 
							
						 
					 
					
						
						
							
							Remove bin/ folders from reposiroty  
						
						 
						
						
						
						
					 
					
						2012-10-10 08:23:17 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							a048a2b471 
							
						 
					 
					
						
						
							
							Convert svn:ignore properties to .gitignore.  
						
						 
						
						
						
						
					 
					
						2012-09-29 20:07:47 +03:00