From 40110876c3eb9743e443f5b2207e61235b2ec3dc Mon Sep 17 00:00:00 2001
From: Scott Howard <showard314@gmail.com>
Date: Thu, 26 Feb 2015 09:57:22 -0500
Subject: [PATCH] Update license.txt for 1.6.0+ directory structure

---
 license.txt | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/license.txt b/license.txt
index fe2dac072..112a2ba85 100644
--- a/license.txt
+++ b/license.txt
@@ -1,12 +1,18 @@
-this file includes licensing information for parts of arduino.
+This file includes licensing information for parts of arduino.
 
-first, the gnu general public license, which covers the main body 
-of the processing/arduino code (in general, all the stuff inside the 'app'
-and 'core' subfolders).
+Unless otherwise explicitly stated in a file or directory:
 
-next, the gnu lesser general public license that covers the arduino core
-and libraries.
+1) Files in hardware/ and libraries/ are licensed unde the GNU Lesser
+General Public License Version 2.1 (or later).
 
+2) Reference documentation, available for download from this repository
+or https://github.com/arduino/reference-en, is licensed CC-BY-SA-3.0.
+
+3) Example files (e.g., */examples/*) are freely released into the
+public domain.
+
+4) All other files are licensed under the GNU General Public License
+Version 2 (or later).
 
 .....................................................................