diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-09-29 17:19:43 -0700 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-09-29 17:19:43 -0700 |
| commit | b64a23b7cc2761f03879ceb6b030ae80171f11e2 (patch) | |
| tree | 86ba49fd1b7275a7e293c3c3bc44e6317bebf67f /docs/GPL_exception.html | |
| parent | fe926bab25e3af81265d4e0bbb79bcdb41b10635 (diff) | |
| parent | 9961286c06c25cd03464d3e2b00bd9b9dedf96ba (diff) | |
| download | android_external_proguard-b64a23b7cc2761f03879ceb6b030ae80171f11e2.tar.gz android_external_proguard-b64a23b7cc2761f03879ceb6b030ae80171f11e2.tar.bz2 android_external_proguard-b64a23b7cc2761f03879ceb6b030ae80171f11e2.zip | |
Merge remote-tracking branch 'aosp/l-preview' into cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0
Diffstat (limited to 'docs/GPL_exception.html')
| -rw-r--r-- | docs/GPL_exception.html | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/docs/GPL_exception.html b/docs/GPL_exception.html index 0a44d66..d610af8 100644 --- a/docs/GPL_exception.html +++ b/docs/GPL_exception.html @@ -7,7 +7,7 @@ <H1>Special Exception to the GNU General Public License</H1> <P> -Copyright © 2002-2009 Eric Lafortune +Copyright © 2002-2013 Eric Lafortune </P> <P> @@ -33,13 +33,18 @@ Place, Suite 330, Boston, MA 02111-1307 USA In addition, as a special exception, Eric Lafortune gives permission to link the code of this program with the following stand-alone applications: <ul> -<li>Apache Ant, -<li>Apache Maven, -<li>the Eclipse ProGuardDT GUI, -<li>the EclipseME JME IDE, -<li>the Sun NetBeans Java IDE, -<li>the Sun JME Wireless Toolkit, and -<li>the Javaground Tools, +<li>Apache Ant,</li> +<li>Apache Maven,</li> +<li>the Google Android SDK,</li> +<li>the Eclipse ProGuardDT GUI,</li> +<li>the EclipseME JME IDE,</li> +<li>the Oracle NetBeans Java IDE,</li> +<li>the Oracle JME Wireless Toolkit,</li> +<li>the Intel TXE SDK,</li> +<li>the Simple Build Tool for Scala (and its scripts),</li> +<li>the NeoMAD Tools by Neomades,</li> +<li>the Javaground Tools, and</li> +<li>the Sanaware Tools,</li> </ul> and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than |