Merge branch 'hook' of github.com:guard/guard into hook

Browse Source

Conflicts:
	lib/guard.rb
	lib/guard/dsl.rb
	lib/guard/hook.rb
	spec/guard/dsl_spec.rb
	spec/guard/hook_spec.rb
	spec/guard_spec.rb

...

This commit is contained in:

Rémy Coutable 2011-04-30 00:49:46 +02:00

parent e853009528 5b8ae609da

commit 20b8a9af69

1 changed files with 2 additions and 2 deletions

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

Show Stats Download Patch File Download Diff File Expand all files Collapse all files