Merge remote-tracking branch 'origin/assistant' into assistant

Browse source

Conflicts:
	Assistant/TransferSlots.hs

...

This commit is contained in:

Joey Hess 2012-07-07 10:58:06 -06:00

parent cd168c6cba 94b06deb64

commit 8939ef3121

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

Diff content is not available