Merge branch '3.0' · eb88d1748c - AMTXTS

Merge branch '3.0'

Conflicts:
	CONTRIBUTORS.txt

Ask Solem 12 years ago

parent

9aed0ebf27 111e0ae58e

commit

eb88d1748c

1 changed files with 1 additions and 0 deletions

Unified View Show Diff Stats

						
							+ 1
							
							- 0
						
CONTRIBUTORS.txt
							 
								View File
							
															@@ -122,3 +122,4 @@ Daniel Lundin, 2012/08/30
														
															 Alexey Zatelepin, 2012/09/18
														
															 Alexey Zatelepin, 2012/09/18
														
															 Sundar Raman, 2012/09/24
														
															 Sundar Raman, 2012/09/24
														
															 Henri Colas, 2012/11/16
														
															 Henri Colas, 2012/11/16
														
															+Thomas Grainger, 2012/11/29