Merge branch TeamCMU the 2nd
This commit is contained in:
		
							
								
								
									
										5
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -35,10 +35,9 @@
 | 
				
			|||||||
# CLion folder
 | 
					# CLion folder
 | 
				
			||||||
Source/.idea/*
 | 
					Source/.idea/*
 | 
				
			||||||
Source/cmake-build-debug/*
 | 
					Source/cmake-build-debug/*
 | 
				
			||||||
 | 
					Source/.DS_Store
 | 
				
			||||||
 | 
					Source/CMakeLists.txt
 | 
				
			||||||
cmake-build-debug
 | 
					cmake-build-debug
 | 
				
			||||||
.idea
 | 
					.idea
 | 
				
			||||||
.DS_Store
 | 
					.DS_Store
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Source/.idea/workspace.xml
 | 
					 | 
				
			||||||
Source/.idea/workspace.xml
 | 
					 | 
				
			||||||
Source/.idea/workspace.xml
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										
											BIN
										
									
								
								Codicil/Images/Balloons.jpg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Codicil/Images/Balloons.jpg
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 519 KiB  | 
							
								
								
									
										
											BIN
										
									
								
								Codicil/Images/tiger.bmp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Codicil/Images/tiger.bmp
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 654 KiB  | 
		Reference in New Issue
	
	Block a user