Merge branch 'develop' of https://github.com/verisign/getdns into develop

Conflicts:
	configure
	configure.ac
This commit is contained in:
Glen Wiley 2013-07-31 16:24:11 -04:00
commit d02404f951
2 changed files with 6 additions and 4970 deletions

6
.gitignore vendored
View File

@ -3,3 +3,9 @@ Makefile
aclocal.m4
depcomp
.deps/
config.status
example-all-functions
example-simple-answers
example-synchronous
example-tree

4970
configure vendored

File diff suppressed because it is too large Load Diff