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

* 'master' of github.com:philsquared/Catch:
  Updated “contributing” docs to reflect new develop branch
This commit is contained in:
Phil Nash 2014-08-21 07:23:45 +01:00
commit aa31d1c275

View File

@ -4,6 +4,10 @@ So you want to contribute something to Catch? That's great! Whether it's a bug f
If you are contributing to the code base there are a few simple guidelines to keep in mind. This also includes notes to help you find your way around. As this is liable to drift out of date please raise an issue or, better still, a pull request for this file, if you notice that.
## Branches
Ongoing development is on the "develop" branch, or on feature branches that are branched off of develop. Please target any pull requests at develop, or, for larger chunks of work, a branch off of develop.
## Directory structure
Users of Catch primarily use the single header version. Maintainers should work with the full source (which is still, primarily, in headers). This can be found in the ```include``` folder, but you may prefer to use one of the IDE project files (for MSVC or XCode). These can be found under ```projects/```*IDE Name*```/```*project name*. A number of contributors have proposed make files, and submitted their own versions. At some point these should be made available too.