Merge branch 'master' of github.com:philsquared/Catch

Browse Source

Conflicts:
	single_include/catch.hpp

...

This commit is contained in:

Phil Nash 2012-09-24 08:40:01 +01:00

parent 799ecf9604 1840929c51

commit e561eec001

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

Diff Content Not Available