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

Browse source

Conflicts:
	Assistant/Watcher.hs

...

This commit is contained in:

Joey Hess 2012-06-18 22:16:16 -04:00

parent 22b563408b 2d457bf8df

commit 9b7f929e96

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