Merge pull request #286 from precla/master

Fixed small typos.
This commit is contained in:
Arvid Norberg 2015-11-22 11:35:55 -05:00
commit 4cd2a35d9d
1 changed files with 2 additions and 2 deletions

View File

@ -49,8 +49,8 @@ When creating a pull request, please consider the following checklist:
production code.
* rebase on top of master periodically
* if your patch is against the current stable release branch, please also
forward-poret the patch to master (at the time of this writing, automatic
forward-port the patch to master (at the time of this writing, automatic
merge in git does not work, possibly because the branch was created in svn)
* if your patch adds a new .cpp file, please make sure it's added to the
appropriate ``Jamfile``, ``Makefile.am`` and ``CMakeList.txt``. If it's adding
a header file, make sure it's added to ``include/libtorrent/Makefile,am``.
a header file, make sure it's added to ``include/libtorrent/Makefile.am``.