Merge commit '55fadb3' into cg_merges_20121214 · b264093ea8 - THC的仓库

Merge commit '55fadb3' into cg_merges_20121214

Conflicts:
	ChangeLog

Luke Dashjr 13 years ago

parent

e9db761d1a 55fadb3780

commit

b264093ea8

1 changed files with 2 additions and 0 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 0
						
ChangeLog
							 
								View File
							
				@@ -2,3 +2,5 @@ See git repository ('git log') for full changelog.
			
				 Git repo can be found at:
			
				 https://github.com/luke-jr/bfgminer
			
				+
			
				+The NEWS file contains most of the changelog