Phil Nash d7e1790347 Merge branch 'master' of https://github.com/gnzlbg/Catch ...

# By gnzlbg
# Via gnzlbg
* 'master' of https://github.com/gnzlbg/Catch:
  Conditionally removes usage of deprecated features

Conflicts (resolved):
	include/internal/catch_common.h
	include/internal/catch_section.hpp

2014-04-18 08:49:35 +01:00

2.0 KiB

Raw Blame History

View Raw