niko-fhtw 
							
						 
					 
					
						
						
							
						
						dc71f6fa63 
					 
					
						
						
							
							added firstdraft code  
						
						 
						
						
						
						
					 
					
						2018-01-19 16:53:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Raphael Maenle 
							
						 
					 
					
						
						
							
						
						5e669fe68c 
					 
					
						
						
							
							Merge branch 'master' into Team_CMU_MergeBase  
						
						 
						
						
						
						
					 
					
						2018-01-10 17:42:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								TabDragon 
							
						 
					 
					
						
						
							
						
						1fabe84848 
					 
					
						
						
							
							Fixed compiler errors with ring initialisation and qVector + MakeFile included  
						
						 
						
						
						
						
					 
					
						2017-12-20 22:02:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								g-spacewhale 
							
						 
					 
					
						
						
							
						
						bf3b103251 
					 
					
						
						
							
							Added David Code, removed Clion Stuff  
						
						 
						
						
						
						
					 
					
						2017-12-07 16:26:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								d-kaselautzke 
							
						 
					 
					
						
						
							
						
						0469915cd9 
					 
					
						
						
							
							Merge branch TeamCMU the 2nd  
						
						 
						
						
						
						
					 
					
						2017-12-06 21:26:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								c-weidinger 
							
						 
					 
					
						
						
							
						
						bf521f741d 
					 
					
						
						
							
							Gitignore  
						
						 
						
						
						
						
					 
					
						2017-12-05 19:47:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								c-weidinger 
							
						 
					 
					
						
						
							
						
						a78ec0c34e 
					 
					
						
						
							
							Changed Gitignore  
						
						 
						
						
						
						
					 
					
						2017-12-05 19:44:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								c-weidinger 
							
						 
					 
					
						
						
							
						
						e12550274b 
					 
					
						
						
							
							Corrected Raphis destroyed Project  
						
						 
						
						
						
						
					 
					
						2017-12-03 11:02:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Raphael Maenle 
							
						 
					 
					
						
						
							
						
						b1b6d55fc6 
					 
					
						
						
							
							removes previously tracked files from commit  
						
						 
						
						
						
						
					 
					
						2017-12-02 17:01:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Raphael Maenle 
							
						 
					 
					
						
						
							
						
						2f91ceaccb 
					 
					
						
						
							
							edited .gitignore once more  
						
						 
						
						
						
						
					 
					
						2017-12-02 16:54:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Raphael Maenle 
							
						 
					 
					
						
						
							
						
						e303642409 
					 
					
						
						
							
							edited gitignore to not sync .idea and cmap-build-debug  
						
						 
						
						
						
						
					 
					
						2017-12-02 16:52:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								PGotzmann 
							
						 
					 
					
						
						
							
						
						c56b117d81 
					 
					
						
						
							
							Added CLions local project directories and .DS_Store (MAC OS) to gitignore  
						
						 
						
						... 
						
						
						
						Local folders created by CLion and MAC OS are now excluded in gitignore. This allows users to work directly in the local Git directory without syncing unnessasary files. 
						
						
					 
					
						2017-11-22 11:05:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								g-spacewhale 
							
						 
					 
					
						
						
							
						
						12cb2023b1 
					 
					
						
						
							
							added swp to gitignore, removed a swp  
						
						 
						
						
						
						
					 
					
						2017-11-18 10:44:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								g-spacewhale 
							
						 
					 
					
						
						
							
						
						beb1404b86 
					 
					
						
						
							
							Merge branch 'master' into TeamCMU  
						
						 
						
						
						
						
					 
					
						2017-11-18 10:24:34 +01:00