From 9edfe480bc3d68d2e61fade3b6bbd315757f5d8e Mon Sep 17 00:00:00 2001
From: Jason Perkins <starkos@industriousone.com>
Date: Tue, 8 Dec 2015 19:34:44 -0500
Subject: [PATCH] Captured changes since alpha6

---
 CHANGES.txt      | 18 ++++++++++++++++++
 CONTRIBUTORS.txt | 21 +++++++++++----------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0d4eb4f8..67fa2300 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,24 @@
 See https://github.com/premake/premake-core/wiki/What's-New-in-5.0
 for the complete list of changes from the Premake 4.x series.
 
+Since 5.0-alpha6:
+
+* New API: additionalusingdirectories()
+* New API: largeaddressaware()
+* New: Embed bytecode to enable better debugging information
+* New: Display elapsed time at completion
+* New: Utility project support for Makefiles
+* New: Enabled SSL support in HTTP functions
+* Fix: Reduce memory usage during baking
+* Fix: Improve performance of wildcard processing
+* Fix: Preserve environment in recursive token expansion
+* Fix: Added missing defines in bootstrap script
+* Fix: Remove /usr/lib64 directories from Mac builds
+* Fix: Added newline after UTF-8 marker in Visual Studio projects
+* Fix: Duplicate escaping on include directories in Makefiles
+* Fix: os.isdir() now works with Windows symbolic links
+* Fix: Use correct path separators in C# response files
+
 Since 5.0-alpha5:
 
 * New API: ignoredefaultlibraries()
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 5949ae07..7416ef07 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -24,23 +24,21 @@ Patch contributors:
     * module loading fixes
     * bug fixes
   Gabi Davar <gabi.davar@discretix.com>
-    * Added file.directory to token environment
+    * added file.directory to token environment
   João Matos (joao@tritao.eu)
     * HTTP download support
     * C# / C++/CLI language support improvements and bugfixes
     * Visual Studio and Make improvements and bugfixes
-    * Response files support for Make backend
+    * response files support for Make backend
+    * numerous bug fixes and smaller features
   leeonix <real-like@yeah.net>
-    * Bug fixes
+    * bug fixes
   Lusito <core@roughael.net>
     * path.join() fixes
-  João Matos (joao@tritao.eu)
-    * HTTP download support
-    * C# / C++/CLI language support improvements and bugfixes
-    * Visual Studio and Make improvements and bugfixes
-    * Response files support for Make backend
   Mark Chandler <https://bitbucket.org/mchandler_blizzard>
-    * Prevent self-linking
+    * prevent self-linking
+  Mark Sararu <mark.sararu@gmail.com>
+    * Makefile bug fixes
   Mihai Sebea <http://twitter.com/mihai_sebea>
     * Xcode exporter fixes and improvements
   M Skibbe
@@ -48,8 +46,11 @@ Patch contributors:
   Renaud Guillard <https://bitbucket.org/noresources>
     * add library search paths argument to os.findlib()
     * return command exit code from os.outputof()
+    * bug fixes and smaller improvements
   rhuvendiek <rhuvendiek@schueco.com>
-    * VC 2010 IDL file support
+    * Visual C 2010 IDL file support
+  Sami Kankaristo <sami@indiumgames.fi>
+    * Utility project support for Makefiles
   tbasnoopy <tba-snoopy@gmx.de>
     * customtoolnamespace()
     * debuggertype()