Merge branch 'master' into dmbs

diff --combined LUFA/DoxygenPages/BuildSystem.txt
index 2c8d0c7,e06727e..d5e051b
--- 1/LUFA/DoxygenPages/BuildSystem.txt
--- 2/LUFA/DoxygenPages/BuildSystem.txt
+++ b/LUFA/DoxygenPages/BuildSystem.txt
@@@ -7,23 -7,10 +7,23 @@@
  /** \page Page_BuildSystem The LUFA Build System\r
   *\r
   *  \section Sec_BuildSystem_Overview Overview of the LUFA Build System\r
 - *  The LUFA build system is an attempt at making a set of re-usable, modular build make files which\r
 - *  can be referenced in a LUFA powered project, to minimize the amount of code required in an\r
 - *  application makefile. The system is written in GNU Make, and each module is independent of\r
 - *  one-another.\r
 + *  The LUFA build system was originally an attempt at making a set of\r
 + *  re-usable, modular build make files which could be referenced in a LUFA\r
 + *  powered project, to minimize the amount of code required in an\r
 + *  application makefile.\r
 + *\r
 + *  As it turned out to be fairly generic in nature, it was split out into its\r
 + *  own separate project, called DMBS (<i>Dean's Makefile Build System</i>)\r
 + *  which is released into the public domain. LUFA specific portions of the\r
 + *  LUFA build system extend DMBS, and provide a universal build system for all\r
 + *  LUFA projects.\r
 + *\r
 + *  The latest DMBS project information can be found at:\r
 + *  https://github.com/abcminiuser/dmbs\r
 + *\r
 + *  DMBS is written in GNU Make, and each module is independent of one-another.\r
 + *\r
 + *  \section SSec_BuildSystem_Using Using the LUFA Build System\r
   *\r
   *  For details on the prerequisites needed for Linux and Windows machines to be able to use the LUFA\r
   *  build system, see \ref Sec_CompilingApps_Prerequisites.\r
@@@ -456,6 -443,10 +456,10 @@@
   *    <td><tt>AVRDUDE_FLAGS</tt></td>\r
   *    <td>Additional flags to pass to avrdude when programming, applied after the automatically generated flags.</td>\r
   *   </tr>\r
+  *   <tr>\r
+  *    <td><tt>AVRDUDE_MEMORY</tt></td>\r
+  *    <td>Main memory space used when programming in an application *e.g. <tt>application</tt> for a DFU bootloader, or <tt>flash</tt> for a regular programmer).</td>\r
+  *   </tr>\r
   *  </table>\r
   *\r
   *  \section SSec_BuildModule_AVRDUDE_ProvidedVariables Module Provided Variables\r

diff --combined Projects/XPLAINBridge/makefile
index aacca67,8ff794a..3913801
--- 1/Projects/XPLAINBridge/makefile
--- 2/Projects/XPLAINBridge/makefile
+++ b/Projects/XPLAINBridge/makefile
@@@ -1,6 -1,6 +1,6 @@@
  #
  #             LUFA Library
- #     Copyright (C) Dean Camera, 2015.
+ #     Copyright (C) Dean Camera, 2016.
  #
  #  dean [at] fourwalledcubicle [dot] com
  #           www.lufa-lib.org
@@@ -31,13 -31,13 +31,13 @@@ LD_FLAGS     
  # Default target
  all:
  
 +OBJDIR      := obj
 +
  # Since this project borrows files from the AVRISP-MKII project which may also have an
  # identical OBJDIR directory, we need to enforce the use of this project's object file
  # directory as the one where the build object files are to be stored by pre-pending the
  # absolute path of the current project to the OBJDIR variable.
 -ifneq ($(OBJDIR),)
 -  override OBJDIR:=$(shell pwd)/$(OBJDIR)
 -endif
 +override OBJDIR:=$(shell pwd)/$(OBJDIR)
  
  # Include LUFA build script makefiles
  include $(LUFA_PATH)/Build/lufa_core.mk