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.

Sign up for GitHub

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

Jump to bottom

Spelling fixes #403

Merged
merged 9 commits into from
Aug 14, 2021
Merged

Spelling fixes #403

merged 9 commits into from
Aug 14, 2021

Commits on Aug 2, 2021

  1. Spelling fixes

    @gsjaardema
    gsjaardema committed Aug 2, 2021
    Configuration menu
    Copy the full SHA
    c716a74 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into spelling-fixes

    @gsjaardema
    gsjaardema committed Aug 2, 2021
    Configuration menu
    Copy the full SHA
    67c4306 View commit details
    Browse the repository at this point in the history

  3. Additional spelling fixes

    @gsjaardema
    gsjaardema committed Aug 2, 2021
    Configuration menu
    Copy the full SHA
    a950dab View commit details
    Browse the repository at this point in the history

  4. One more fix

    @gsjaardema
    gsjaardema committed Aug 2, 2021
    Configuration menu
    Copy the full SHA
    660fe97 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2021

  1. Fix bad conflict resolution

    @gsjaardema
    gsjaardema committed Aug 3, 2021
    Configuration menu
    Copy the full SHA
    4a16fe0 View commit details
    Browse the repository at this point in the history

  2. Restore email address to somwhere.com

    @gsjaardema
    gsjaardema committed Aug 3, 2021
    Configuration menu
    Copy the full SHA
    e8a48b3 View commit details
    Browse the repository at this point in the history

  3. Fix tests; rename misspelled file

    @gsjaardema
    gsjaardema committed Aug 3, 2021
    Configuration menu
    Copy the full SHA
    20f922d View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2021

  1. Replace 'entry file' with 'entire file' 

    Spell checker codespell  selected the wrong word replacement.
    @bartlettroscoe
    bartlettroscoe committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    c35972d View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2021

  1. Merge remote-tracking branch 'github/master' into 403-spelling-fixes (T… 

    …riBITSPub#403)

I removed the files:

* tribits/doc/README.DEPENDENCIES
* tribits/doc/developers_guide/generate-dev-guide.sh

that must have got added back accidentally in an earlier merge resolution
step.

I fixed straightforward conflicts in the files:

* tribits/core/package_arch/TribitsGlobalMacros.cmake
* tribits/core/package_arch/TribitsReadDepsFilesCreateDepsGraph.cmake
* tribits/core/package_arch/TribitsSystemDataStructuresMacrosFunctions.rst
    @bartlettroscoe
    bartlettroscoe committed Aug 14, 2021
    Configuration menu
    Copy the full SHA
    cd4bb0b View commit details
    Browse the repository at this point in the history