devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master' into otr

Browse Source 
Conflicts:
	.gitignore
	Makefile.am
This commit is contained in:
James Booth
2013-09-17 01:34:57 +01:00
parent e90ba5747b ee8ff948bf
commit cab2e3cfe4
9 changed files with 117 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -32,3 +32,4 @@ TODO
plugins/
*_key.txt
*_fingerprints.txt
src/gitversion.c