Merge branch 'master' into openpgp

Browse Source

Conflicts:
	src/command/commands.c
	src/command/commands.h

...

This commit is contained in:

James Booth

2015-06-17 00:40:06 +01:00

parent 637b8bee9f a798dc5618

commit 8fde14879a

25 changed files with 689 additions and 684 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

332

src/command/commands.c

File diff suppressed because it is too large Load Diff