Merge branch 'master' into HEAD

Browse source

Conflicts:
	Makefile.am
	hydra.c
	hydra.h

Additional changes to better fit the newer design patterns.

...

This commit is contained in:

catatonic 2017-07-07 20:52:58 +00:00

parent 1503c8a381 cea00533ea

commit cf089a6c75

86 changed files with 2841 additions and 2301 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2114

hydra.c

View file

File diff suppressed because it is too large Load diff