Fix contributor ordering. Sort by last name per release

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index d03294959a9efb29c6ef4aefca7ceae701c34fff..a5bfa312e057c2ead4fbc6e9da2c948f536b33aa 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -11,16 +11,6 @@ NOTE: This is a major release.  You should expect that some targets may rebuild
 Significant changes in some python action signatures. Also switching between PY 2 and PY 3.5, 3.6
 may cause rebuilds.  In no case should rebuilds not happen.
 
-  From Ibrahim Esmat:
-    - Added the capability to build Windows Store Compatible libraries that can be used
-      with Universal Windows Platform (UWP) Apps and published to the store
-
-  From Richard West:
-    - Added nested / namespace tool support
-    - Added a small fix to the python3 tool loader when loading a tool as a package
-    - Added additional documentation to the user manual on using toolpaths with the environment
-      This includes the use of sys.path to search for tools installed via pip or package managers
-
   From William Blevins:
     - Updated D language scanner support to latest: 2.071.1. (PR #1924)
       https://dlang.org/spec/module.html accessed 11 August 2016
@@ -45,6 +35,10 @@ may cause rebuilds.  In no case should rebuilds not happen.
     - Changes to Action Function and Action Class signiture creation.  NOTE: This will cause rebuilds
       for many builds when upgrading to SCons 3.0
 
+  From Ibrahim Esmat:
+    - Added the capability to build Windows Store Compatible libraries that can be used
+      with Universal Windows Platform (UWP) Apps and published to the store
+
   From Daniel Holth:
     - Add basic support for PyPy (by deleting __slots__ from Node with a
       metaclass on PyPy); wrap most-used open() calls in 'with' statements to
@@ -87,6 +81,12 @@ may cause rebuilds.  In no case should rebuilds not happen.
     - Fixed PCHPDBFLAGS causing a deprecation warning on MSVC v8 and later when
       using PCHs and PDBs together.
 
+  From Richard West:
+    - Added nested / namespace tool support
+    - Added a small fix to the python3 tool loader when loading a tool as a package
+    - Added additional documentation to the user manual on using toolpaths with the environment
+      This includes the use of sys.path to search for tools installed via pip or package managers
+
   From Russel Winder:
     - Reordered the default D tools from "dmd, gdc, ldc" to "dmd, ldc, gdc".
     - Add a ProgramAllAtOnce builder to the dmd, ldc, and gdc tools. (PR #448)
@@ -332,35 +332,40 @@ RELEASE 2.3.3 - Sun, 24 Aug 2014 21:08:33 -0400
 
 RELEASE 2.3.2
 
+  From Dirk Baechle:
+    - Update XML doc editor configuration
+    - Fix: Allow varlist to be specified as list of strings for Actions (#2754)
+
   From veon on bitbucket:
     - Fixed handling of nested ifs in CPP scanner PreProcessor class.
 
+  From Shane Gannon:
+    - Support for Visual Studio 2013 (12.0)
+
   From Michael Haubenwallner:
     - Respect user's CC/CXX values; don't always overwrite in generate()
     - Delegate linker Tool.exists() to CC/CXX Tool.exists().
 
+  From Rob Managan:
+    - Updated the TeX builder to support use of the -synctex=1
+      option and the files it creates.
+    - Updated the TeX builder to correctly clean auxiliary files when
+      the biblatex package is used.
+
+  From Gary Oberbrunner:
+    - get default RPM architecture more robustly when building RPMs
+
   From Amir Szekely:
     - Fixed NoClean() for multi-target builders (#2353).
 
+  From Paweł Tomulik:
+    - Fix SConf tests that write output
+
   From Russel Winder:
     - Revamp of the D language support. Tools for DMD, GDC and LDC provided
       and integrated with the C and C++ linking. NOTE: This is only tested
       with D v2. Support for D v1 is now deprecated.
 
-  From Paweł Tomulik:
-    - Fix SConf tests that write output
-
->>>>>>> other
-  From Gary Oberbrunner:
-    - get default RPM architecture more robustly when building RPMs
-
-  From Shane Gannon:
-    - Support for Visual Studio 2013 (12.0)
-
-  From Sye van der Veen:
-    - Support for Visual Studio 12.0Exp, and fixes for earlier MSVS
-      versions.
-
   From Anatoly Techtonik:
     - Several improvements for running scons.py from source:
       * engine files form source directory take priority over all other
@@ -375,15 +380,10 @@ RELEASE 2.3.2
       SCons initialization (it will still be possible to use these tools
       explicitly)
 
-  From Dirk Baechle:
-    - Update XML doc editor configuration
-    - Fix: Allow varlist to be specified as list of strings for Actions (#2754)
+  From Sye van der Veen:
+    - Support for Visual Studio 12.0Exp, and fixes for earlier MSVS
+      versions.
 
-  From Rob Managan:
-    - Updated the TeX builder to support use of the -synctex=1
-      option and the files it creates.
-    - Updated the TeX builder to correctly clean auxiliary files when
-      the biblatex package is used.
 
 RELEASE 2.3.1