diff options
| author | Rolf Eike Beer <eike@sf-mail.de> | 2013-06-03 17:42:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-06-03 17:43:52 (GMT) |
| commit | e4e09212c58995a6cfde7d101bc02fce0f7829be (patch) | |
| tree | 219aa9a80e2c182d3be38d3cccf8f3809c585720 /Utilities/cmcurl/urldata.h | |
| parent | c9b75dcd734e2dd09eadbd9b16a6497bae95941c (diff) | |
| parent | a4d8c64d10105fd4448ffde6a5d2fb74c1bb4f57 (diff) | |
| download | CMake-e4e09212c58995a6cfde7d101bc02fce0f7829be.zip CMake-e4e09212c58995a6cfde7d101bc02fce0f7829be.tar.gz CMake-e4e09212c58995a6cfde7d101bc02fce0f7829be.tar.bz2 | |
Merge branch 'master' into escape-regex-specials-in-path
Resolve conflicts in Tests/CTestTestMemcheck/CMakeLists.txt by combining
changes from both sides.
Diffstat (limited to 'Utilities/cmcurl/urldata.h')
| -rw-r--r-- | Utilities/cmcurl/urldata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmcurl/urldata.h b/Utilities/cmcurl/urldata.h index 9537ce3..46d956d 100644 --- a/Utilities/cmcurl/urldata.h +++ b/Utilities/cmcurl/urldata.h @@ -621,7 +621,7 @@ typedef CURLcode (*Curl_done_func)(struct connectdata *, CURLcode, bool); * Store's request specific data in the easy handle (SessionHandle). * Previously, these members were on the connectdata struct but since * a conn struct may now be shared between different SessionHandles, - * we store connection-specifc data here. + * we store connection-specific data here. * */ struct HandleData { |