diff options
| author | William Deegan <bill@baddogconsulting.com> | 2023-02-02 20:29:05 -0800 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2023-02-02 20:29:05 -0800 |
| commit | 3a3cf8f4da6416d246e41528416112198f695cab (patch) | |
| tree | d1f3bf2c12b48d1418a5fed83450ddcedd19b6d8 /RELEASE.txt | |
| parent | 6abf249d2e38df51dd8e647176b7ce6dacfdf9b9 (diff) | |
| download | scons-git-3a3cf8f4da6416d246e41528416112198f695cab.tar.gz | |
[ci skip] remove umerged conflict markers in RELEASE.txt
Diffstat (limited to 'RELEASE.txt')
| -rw-r--r-- | RELEASE.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/RELEASE.txt b/RELEASE.txt index 1bf6bf859..31b56aac1 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -148,17 +148,14 @@ DOCUMENTATION - Updated the User Guide chapter on installation: modernized the notes on Python installs, SCons installs, and having multiple SCons versions present on a single system. -<<<<<<< HEAD - Updated the User Guide chapter on variant directories with more explanation, and the introduction of terms like "out of tree" that may help in forming a mental model. - Additional explanations for MSVSProject and MSVSSolution builders. - Updated MSVC documentation - adds "version added" annotations on recently added construction variables and provides a version-mapping table. -======= - Added further details in the documentation of Append and related methods on the special handling of CPPDEFINES. ->>>>>>> d9a82d681 (Split out CPPDEFINES handling in Append methods) DEVELOPMENT ----------- |