summaryrefslogtreecommitdiffstats
path: root/CHANGES.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into feature/minor_java_improv...William Deegan2022-05-221-0/+26
|\
| * Merge pull request #4111 from mwichmann/msvc/cachefixWilliam Deegan2022-05-151-0/+9
| |\
| | * Merge branch 'master' into msvc/cachefixWilliam Deegan2022-05-151-2/+51
| | |\
| | * \ Merge branch 'master' into msvc/cachefixWilliam Deegan2022-03-291-1/+17
| | |\ \
| | * | | MSVS_CACHE: Reword the CHANGES and RELEASE entriesMats Wichmann2022-03-111-5/+8
| | * | | Tweak the MSVC environment vars cacheMats Wichmann2022-03-081-0/+6
| * | | | Merge branch 'master' into jbrill-msvc-usesettingsWilliam Deegan2022-05-151-0/+15
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into jbrill-msvc-vscomntoolsJoseph Brill2022-05-151-2/+30
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Correct inadvertent missing word in description.Joseph Brill2022-05-041-3/+3
| | * | | | Add note for SDK 6.0-7.1 usage.Joseph Brill2022-05-041-2/+7
| | * | | | Propagate OS and windir environment variables to msvc batch file environmentJoseph Brill2022-05-041-0/+5
| | * | | | Merge branch 'master' into jbrill-msvc-vscomntoolsJoseph Brill2022-05-031-1/+10
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into jbrill-msvc-vscomntoolsJoseph Brill2022-05-031-0/+5
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into jbrill-msvc-vscomntoolsJoseph Brill2022-04-151-0/+5
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into jbrill-msvc-vscomntoolsJoseph Brill2022-04-101-0/+12
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into jbrill-msvc-vscomntoolsJoseph Brill2022-03-251-1/+1
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into jbrill-msvc-vscomntoolsJoseph Brill2022-03-221-0/+5
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into jbrill-msvc-vscomntoolsJoseph Brill2022-03-211-0/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Update CHANGES.txt and RELEASE.txt.Joseph Brill2022-03-201-4/+5
| | * | | | | | | | | | | Replace environment variable names VS70COMNTOOLS and VS60COMNTOOLS with VSCOM...Joseph Brill2022-03-191-0/+4
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into jbrill-msvc-usesettingsJoseph Brill2022-05-151-2/+30
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into jbrill-msvc-usesettingsJoseph Brill2022-05-031-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into jbrill-msvc-usesettingsJoseph Brill2022-05-031-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into jbrill-msvc-usesettingsJoseph Brill2022-04-151-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into jbrill-msvc-usesettingsJoseph Brill2022-04-101-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into jbrill-msvc-usesettingsJoseph Brill2022-03-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Preliminary changes and release comments.Joseph Brill2022-03-251-0/+2
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | [ci skip] Updated CHANGES/RELEASE.txt to move the blurbs for these changes to...William Deegan2022-05-221-4/+4
* | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into feature/minor_java_improv...William Deegan2022-05-151-1/+249
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | [ci skip] slight change to description of SHELL_ENV_GENERATORWilliam Deegan2022-05-121-2/+2
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into shell_subst_env_varsDaniel Moody2022-05-111-0/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | update changes/release notesDaniel Moody2022-05-111-0/+2
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into shell_subst_env_varsDaniel Moody2022-05-111-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | update changes and release notes.Daniel Moody2022-05-111-0/+1
| * | | | | | | | | | | fix whitespace typoDaniel Moody2022-05-111-1/+1
| * | | | | | | | | | | switched name to SHELL_ENV_GENERATORDaniel Moody2022-05-101-1/+1
| * | | | | | | | | | | added way for user to configure shell envronment before its executed.Daniel Moody2022-05-091-3/+6
| |/ / / / / / / / / /
| * | | | | | | | | | Fix content-timestamp decider for symlinksMats Wichmann2022-05-061-0/+3
| * | | | | | | | | | Merge branch 'master' into masterWilliam Deegan2022-05-051-0/+9
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into ninja_alias_generated_filesWilliam Deegan2022-05-051-1/+23
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [ci skip] Update CHANGES/RELEASE with more user focused description of conten...William Deegan2022-05-051-4/+8
| | * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into ninja_alias_generated_filesDaniel Moody2022-04-151-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | more verbose changes.txtDaniel Moody2022-04-151-1/+4
| | * | | | | | | | | | | update changes and releases text filesDaniel Moody2022-04-141-2/+4
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into masterWilliam Deegan2022-05-041-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into ninja_fix_python36_windowsWilliam Deegan2022-05-041-3/+22
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | update changes/releases textsDaniel Moody2022-04-201-0/+3
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into masterWilliam Deegan2022-05-041-3/+22
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge pull request #4141 from dmoody256/ninja_mingw_parse_formatWilliam Deegan2022-05-041-2/+5
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | adding testDaniel Moody2022-05-041-4/+5