CMake

Commit Graph

Author	SHA1	Message	Date
Brad King	53b8df596f	curl: Drop '-DEV' from version since this is a curl release We imported curl from an upstream release, so report the corresponding release version to servers. This is consistent with the version we presented when our builtin curl was 7.16.1.	2014-10-29 16:43:41 -04:00
Brad King	80c881f793	Merge branch 'curl-upstream' into update-curl Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later.	2014-10-29 16:43:21 -04:00
Brad King	9cf069f88b	curl: Move sources back into upstream layout Update our build files as needed to compensate.	2014-10-29 16:41:10 -04:00

Author

SHA1

Message

Date

Brad King

53b8df596f

curl: Drop '-DEV' from version since this is a curl release

We imported curl from an upstream release, so report the corresponding
release version to servers.  This is consistent with the version we
presented when our builtin curl was 7.16.1.

2014-10-29 16:43:41 -04:00

Brad King

80c881f793

Merge branch 'curl-upstream' into update-curl

Resolve all conflicts in favor of the upstream side.
We can re-apply specific changes later.

2014-10-29 16:43:21 -04:00

Brad King

9cf069f88b

curl: Move sources back into upstream layout

Update our build files as needed to compensate.

2014-10-29 16:41:10 -04:00

3 Commits