Merge branch 'curl-upstream' into update-curl

Browse Source

Use the '-s ours' merge strategy to keep our side unchanged.
This merge brings in the upstream snapshot as of the version
of curl on which our source is based.  This will allow new
snapshots to be merged with our changes.

...

This commit is contained in:

Brad King 2014-10-08 15:09:22 -04:00

parent 661fa7c917 f086cb372e

commit a636de1e2b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available