Skip to content
Browse files

Merge pull request #122 from andersmalm/ThreeZeroOne

fix for http://jira.mosync.com/browse/MOSYNC-1915, updated license text
  • Loading branch information...
2 parents 02e24e3 + 7690063 commit 123366f2f5f992e14ae8ad45fa2955f3a5399fe9 @andersmalm andersmalm committed Mar 28, 2012
View
4 tools/ReleasePackageBuild/build_package_tools/mosync_docs/licenses/mosync-license.txt
@@ -1,4 +1,4 @@
-Copyright (C) 2010 MoSync AB. MoSync(R) is a registered trademark of MoSync AB in the European Union, the United States, and other countries.
+Copyright (C) 2012 MoSync AB. MoSync(R) is a registered trademark of MoSync AB in the European Union, the United States, and other countries.
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License published by the Free Software Foundation, version 2.
@@ -10,7 +10,7 @@ Licenses for third party libraries and applications included in the software are
apache-license-1.1.txt covers part of makesis-4.
-apache-license-2.0.txt covers the AMR decoder, gsm_amr, aapt, adb, AdbWinApi.dll, android-3.jar, android-4.jar, android-7.jar apkbuilder.jar, dx.jar, PhoneGap, and Apache Commons Compress.
+apache-license-2.0.txt covers the AMR decoder, gsm_amr, aapt, adb, AdbWinApi.dll, android-3.jar, android-4.jar, android-7.jar apkbuilder.jar, dx.jar, PhoneGap, C2DM, and Apache Commons Compress.
expat-license.txt covers Expat.

0 comments on commit 123366f

Please sign in to comment.
Something went wrong with that request. Please try again.