Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master 1.24.0 to develop #1648

Merged
merged 12 commits into from
Apr 1, 2020
Merged

Conversation

czoido
Copy link
Contributor

@czoido czoido commented Apr 1, 2020

No description provided.

czoido and others added 12 commits March 23, 2020 13:13
Co-authored-by: Daniel <danimanzaneque@gmail.com>
* Convert all references to lowercase

* fix

* Update developing_packages/workspaces.rst

* Update developing_packages/workspaces.rst

* Update howtos/manage_shared_libraries/env_vars.rst

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com>

* Update devtools/build_requires.rst

Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com>

* Update creating_packages/define_abi_compatibility.rst

Co-Authored-By: Javier G. Sogo <jgsogo@gmail.com>

Co-authored-by: Javier G. Sogo <jgsogo@gmail.com>
…mands (conan-io#1634)

* Remove linkcheck from master jobs

* remove indexing stuff from deploy script

* remove old gh_pages script

* remove nginx script

* remove make_mac

* remove elastic stuff

Co-authored-by: Javier G. Sogo <jgsogo@gmail.com>
* conan-io#1506 Add Troubleshooting for duplicated package

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* conan-io#1506 Better block format

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* conan-io#1506 Better block format

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Change the perspective to transitive package

Signed-off-by: Uilian Ries <uilianries@gmail.com>

Co-authored-by: Javier G. Sogo <jgsogo@gmail.com>
* Use the build folder to apply any patch

Some motivation: conan-io/conan-center-index#1107 (comment)

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Update build folder comment

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* Update reference/tools.rst

Co-authored-by: Javier G. Sogo <jgsogo@gmail.com>
Co-authored-by: Daniel <danimanzaneque@gmail.com>
Co-authored-by: Javier G. Sogo <jgsogo@gmail.com>
…ence (conan-io#1487)

* add matrix-params to docs

* finally landed in 7.3.2

* Update reference/config_files/artifacts.properties.rst

Co-Authored-By: Carlos Zoido <mrgalleta@gmail.com>

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
@czoido czoido merged commit a78d158 into conan-io:develop Apr 1, 2020
@czoido czoido deleted the master_1.24.0_to_develop branch January 21, 2021 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants