[xiph-commits] r17137 - branches/theorarm-merge-branch

[robin at svn.xiph.org]

Author: robin
Date: 2010-04-10 15:13:45 -0700 (Sat, 10 Apr 2010)
New Revision: 17137

Modified:
   branches/theorarm-merge-branch/AUTHORS
   branches/theorarm-merge-branch/CHANGES
   branches/theorarm-merge-branch/COPYING
Log:
Flip license to BSD.



Modified: branches/theorarm-merge-branch/AUTHORS
===================================================================
--- branches/theorarm-merge-branch/AUTHORS	2010-04-07 15:28:17 UTC (rev 17136)
+++ branches/theorarm-merge-branch/AUTHORS	2010-04-10 22:13:45 UTC (rev 17137)
@@ -45,5 +45,7 @@
 Rodolphe Ortalo
 	- Bug fixes
 
+Robin Watts
+	- ARM code optimisations
 
 and other Xiph.org contributors

Modified: branches/theorarm-merge-branch/CHANGES
===================================================================
--- branches/theorarm-merge-branch/CHANGES	2010-04-07 15:28:17 UTC (rev 17136)
+++ branches/theorarm-merge-branch/CHANGES	2010-04-10 22:13:45 UTC (rev 17137)
@@ -1,3 +1,8 @@
+theorarm_merge_branch
+
+ - Implement ARM versions of speed critical functions
+ - Tweak C to run better on ARMs
+
 libtheora 1.1.2 (unreleased snapshot)
 
  - Fix Huffman table decoding with OC_HUFF_SLUSH is set to 0

Modified: branches/theorarm-merge-branch/COPYING
===================================================================
--- branches/theorarm-merge-branch/COPYING	2010-04-07 15:28:17 UTC (rev 17136)
+++ branches/theorarm-merge-branch/COPYING	2010-04-10 22:13:45 UTC (rev 17137)
@@ -1,18 +1,5 @@
-The license for this branch is currently 'in flux'. Currently all the
-changes from the branch on which this is based are Copyright (C) 2009-2010
-Robin Watts for Pinknoise Productions Ltd, and can be used either under
-license from Pinknoise Productions, or under the standard GNU GPL.
+Copyright (C) 2002-2010 Xiph.org Foundation
 
-It is anticipated that this will change back to the simple BSD license
-used by the original branch within a month or so, whereupon this
-branch will be merged back to the trunk/branch it forked from.
-
-The original copyright statement follows:
------------------------------------------
-
-
-Copyright (C) 2002-2009 Xiph.org Foundation
-
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met: