diff options
| author | Phil Nash | 2014-08-22 19:36:53 +0100 |
|---|---|---|
| committer | Phil Nash | 2014-08-22 19:36:53 +0100 |
| commit | 341a9c444313cb73f276ad9d64e6dcca6ef99b75 (patch) | |
| tree | 0fc41712e2e431eca2560e473d43d1af1e70298b /projects/SelfTest/ToStringWhich.cpp | |
| parent | 93b61e119435ea6c67e8d6ee53d350ef24f482ab (diff) | |
| parent | 85d33e2cbd5354c36000424f823fc87707a24c3c (diff) | |
| download | catch3-341a9c444313cb73f276ad9d64e6dcca6ef99b75.tar.gz | |
Merge branch 'master' of github.com:philsquared/Catch into develop
# By Andy Balaam
# Via Phil Nash (2) and Andy Balaam (1)
* 'master' of github.com:philsquared/Catch:
Fix a typo (missing "n")
Conflicts:
README.md
include/internal/catch_version.hpp
single_include/catch.hpp
Diffstat (limited to 'projects/SelfTest/ToStringWhich.cpp')
0 files changed, 0 insertions, 0 deletions