aboutsummaryrefslogtreecommitdiffstats
path: root/Tremolo/misc.h
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2010-03-18 15:56:16 -0700
committerGloria Wang <gwang@google.com>2010-03-18 15:56:16 -0700
commit2da723a953a18e3c7fec194cec1216cf31130c86 (patch)
treeee45e4e4ee0185cf9edd4ca8558dfa25887a93ab /Tremolo/misc.h
parent37fe158a8611dd11ec0253ab1552399b780988dc (diff)
downloadexternal_tremolo-2da723a953a18e3c7fec194cec1216cf31130c86.zip
external_tremolo-2da723a953a18e3c7fec194cec1216cf31130c86.tar.gz
external_tremolo-2da723a953a18e3c7fec194cec1216cf31130c86.tar.bz2
Update license header for Tremolo and remove unused script.
Change-Id: I10d4885e51c15f7e4adfa6455ccab50561db9a94
Diffstat (limited to 'Tremolo/misc.h')
-rw-r--r--Tremolo/misc.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/Tremolo/misc.h b/Tremolo/misc.h
index dd325f1..4176eb6 100644
--- a/Tremolo/misc.h
+++ b/Tremolo/misc.h
@@ -1,10 +1,11 @@
/************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
* copyright notice, this list of conditions and the following disclaimer
* in the documentation and/or other materials provided with the
* distribution.
- * * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ * * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT