summaryrefslogtreecommitdiffstats
path: root/native_client_sdk/src/libraries
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 18:58:52 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 18:58:52 +0000
commitaeaed3b6b3528d636ce4b22f92f072bd91542727 (patch)
treea1f76f85655f5e7bcf9aa9a487cb81ed8b344a85 /native_client_sdk/src/libraries
parent55fa5668108fc612439d8334ba7cf5b07414008e (diff)
downloadchromium_src-aeaed3b6b3528d636ce4b22f92f072bd91542727.zip
chromium_src-aeaed3b6b3528d636ce4b22f92f072bd91542727.tar.gz
chromium_src-aeaed3b6b3528d636ce4b22f92f072bd91542727.tar.bz2
Switching license notice from nacl to chromium as the naclsdk has been
merged into chromium. BUG=None TEST=None R=noelallen@chromium.org,steveblock@chromium.org Review URL: http://codereview.chromium.org/9051006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src/libraries')
-rw-r--r--native_client_sdk/src/libraries/build.scons2
-rw-r--r--native_client_sdk/src/libraries/c_salt/test/gtest_event_listener.cc2
-rw-r--r--native_client_sdk/src/libraries/c_salt/test/gtest_event_listener.h2
-rw-r--r--native_client_sdk/src/libraries/c_salt/test/gtest_instance.cc2
-rw-r--r--native_client_sdk/src/libraries/c_salt/test/gtest_instance.h2
-rw-r--r--native_client_sdk/src/libraries/c_salt/test/gtest_module.cc2
-rw-r--r--native_client_sdk/src/libraries/c_salt/test/gtest_nacl_environment.cc2
-rw-r--r--native_client_sdk/src/libraries/c_salt/test/gtest_nacl_environment.h2
-rw-r--r--native_client_sdk/src/libraries/c_salt/test/gtest_runner.cc2
-rw-r--r--native_client_sdk/src/libraries/c_salt/test/gtest_runner.h2
-rw-r--r--native_client_sdk/src/libraries/c_salt/threading/condition_lock.h2
-rw-r--r--native_client_sdk/src/libraries/c_salt/threading/pthread_ext.h2
-rw-r--r--native_client_sdk/src/libraries/c_salt/threading/ref_count.h2
-rw-r--r--native_client_sdk/src/libraries/c_salt/threading/scoped_mutex_lock.h2
-rw-r--r--native_client_sdk/src/libraries/c_salt/threading/thread_condition.h2
-rw-r--r--native_client_sdk/src/libraries/gtest/build.scons2
-rwxr-xr-xnative_client_sdk/src/libraries/scons2
-rwxr-xr-xnative_client_sdk/src/libraries/scons.bat2
18 files changed, 18 insertions, 18 deletions
diff --git a/native_client_sdk/src/libraries/build.scons b/native_client_sdk/src/libraries/build.scons
index abc1abc..d2c8c28 100644
--- a/native_client_sdk/src/libraries/build.scons
+++ b/native_client_sdk/src/libraries/build.scons
@@ -1,6 +1,6 @@
#! -*- python -*-
#
-# Copyright (c) 2011 The Native Client Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/native_client_sdk/src/libraries/c_salt/test/gtest_event_listener.cc b/native_client_sdk/src/libraries/c_salt/test/gtest_event_listener.cc
index 0afb3ed..2a7f4ce 100644
--- a/native_client_sdk/src/libraries/c_salt/test/gtest_event_listener.cc
+++ b/native_client_sdk/src/libraries/c_salt/test/gtest_event_listener.cc
@@ -1,4 +1,4 @@
-// Copyright 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "c_salt/test/gtest_event_listener.h"
diff --git a/native_client_sdk/src/libraries/c_salt/test/gtest_event_listener.h b/native_client_sdk/src/libraries/c_salt/test/gtest_event_listener.h
index 6419683..39f5139 100644
--- a/native_client_sdk/src/libraries/c_salt/test/gtest_event_listener.h
+++ b/native_client_sdk/src/libraries/c_salt/test/gtest_event_listener.h
@@ -1,4 +1,4 @@
-// Copyright 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef C_SALT_TEST_GTEST_EVENT_LISTENER_H_
diff --git a/native_client_sdk/src/libraries/c_salt/test/gtest_instance.cc b/native_client_sdk/src/libraries/c_salt/test/gtest_instance.cc
index 1445bd9..0da1b70 100644
--- a/native_client_sdk/src/libraries/c_salt/test/gtest_instance.cc
+++ b/native_client_sdk/src/libraries/c_salt/test/gtest_instance.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/native_client_sdk/src/libraries/c_salt/test/gtest_instance.h b/native_client_sdk/src/libraries/c_salt/test/gtest_instance.h
index aa180f8..1cdaa01 100644
--- a/native_client_sdk/src/libraries/c_salt/test/gtest_instance.h
+++ b/native_client_sdk/src/libraries/c_salt/test/gtest_instance.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef C_SALT_TEST_GTEST_INSTANCE_H_
diff --git a/native_client_sdk/src/libraries/c_salt/test/gtest_module.cc b/native_client_sdk/src/libraries/c_salt/test/gtest_module.cc
index 3cc0ad0..9b34c6e 100644
--- a/native_client_sdk/src/libraries/c_salt/test/gtest_module.cc
+++ b/native_client_sdk/src/libraries/c_salt/test/gtest_module.cc
@@ -1,4 +1,4 @@
-// Copyright 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "c_salt/test/gtest_instance.h"
diff --git a/native_client_sdk/src/libraries/c_salt/test/gtest_nacl_environment.cc b/native_client_sdk/src/libraries/c_salt/test/gtest_nacl_environment.cc
index 416226b..aefb175 100644
--- a/native_client_sdk/src/libraries/c_salt/test/gtest_nacl_environment.cc
+++ b/native_client_sdk/src/libraries/c_salt/test/gtest_nacl_environment.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "c_salt/test/gtest_nacl_environment.h"
diff --git a/native_client_sdk/src/libraries/c_salt/test/gtest_nacl_environment.h b/native_client_sdk/src/libraries/c_salt/test/gtest_nacl_environment.h
index 8183565..35a6043 100644
--- a/native_client_sdk/src/libraries/c_salt/test/gtest_nacl_environment.h
+++ b/native_client_sdk/src/libraries/c_salt/test/gtest_nacl_environment.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/native_client_sdk/src/libraries/c_salt/test/gtest_runner.cc b/native_client_sdk/src/libraries/c_salt/test/gtest_runner.cc
index d6afab0..fbe4808 100644
--- a/native_client_sdk/src/libraries/c_salt/test/gtest_runner.cc
+++ b/native_client_sdk/src/libraries/c_salt/test/gtest_runner.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "c_salt/test/gtest_runner.h"
diff --git a/native_client_sdk/src/libraries/c_salt/test/gtest_runner.h b/native_client_sdk/src/libraries/c_salt/test/gtest_runner.h
index d8c2a6e..18f64bf 100644
--- a/native_client_sdk/src/libraries/c_salt/test/gtest_runner.h
+++ b/native_client_sdk/src/libraries/c_salt/test/gtest_runner.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef C_SALT_TEST_GTEST_RUNNER_H_
diff --git a/native_client_sdk/src/libraries/c_salt/threading/condition_lock.h b/native_client_sdk/src/libraries/c_salt/threading/condition_lock.h
index 1d6b962..d50860c 100644
--- a/native_client_sdk/src/libraries/c_salt/threading/condition_lock.h
+++ b/native_client_sdk/src/libraries/c_salt/threading/condition_lock.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/native_client_sdk/src/libraries/c_salt/threading/pthread_ext.h b/native_client_sdk/src/libraries/c_salt/threading/pthread_ext.h
index 2152549..511adfa 100644
--- a/native_client_sdk/src/libraries/c_salt/threading/pthread_ext.h
+++ b/native_client_sdk/src/libraries/c_salt/threading/pthread_ext.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/native_client_sdk/src/libraries/c_salt/threading/ref_count.h b/native_client_sdk/src/libraries/c_salt/threading/ref_count.h
index 55d3db1..0efae615 100644
--- a/native_client_sdk/src/libraries/c_salt/threading/ref_count.h
+++ b/native_client_sdk/src/libraries/c_salt/threading/ref_count.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef REF_COUNT_H_
diff --git a/native_client_sdk/src/libraries/c_salt/threading/scoped_mutex_lock.h b/native_client_sdk/src/libraries/c_salt/threading/scoped_mutex_lock.h
index 03868ae..10fbf61d 100644
--- a/native_client_sdk/src/libraries/c_salt/threading/scoped_mutex_lock.h
+++ b/native_client_sdk/src/libraries/c_salt/threading/scoped_mutex_lock.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/native_client_sdk/src/libraries/c_salt/threading/thread_condition.h b/native_client_sdk/src/libraries/c_salt/threading/thread_condition.h
index cacd4dae..19c6399 100644
--- a/native_client_sdk/src/libraries/c_salt/threading/thread_condition.h
+++ b/native_client_sdk/src/libraries/c_salt/threading/thread_condition.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Native Client Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/native_client_sdk/src/libraries/gtest/build.scons b/native_client_sdk/src/libraries/gtest/build.scons
index 55a124e..dd3b788 100644
--- a/native_client_sdk/src/libraries/gtest/build.scons
+++ b/native_client_sdk/src/libraries/gtest/build.scons
@@ -1,5 +1,5 @@
# -*- python -*-
-# Copyright (c) 2011 The Native Client Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/native_client_sdk/src/libraries/scons b/native_client_sdk/src/libraries/scons
index d4daf81..17e9350 100755
--- a/native_client_sdk/src/libraries/scons
+++ b/native_client_sdk/src/libraries/scons
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 2011 The Native Client Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
diff --git a/native_client_sdk/src/libraries/scons.bat b/native_client_sdk/src/libraries/scons.bat
index d3c6c06..d56f245 100755
--- a/native_client_sdk/src/libraries/scons.bat
+++ b/native_client_sdk/src/libraries/scons.bat
@@ -1,6 +1,6 @@
@echo off
-:: Copyright (c) 2011 The Native Client Authors. All rights reserved.
+:: Copyright (c) 2011 The Chromium Authors. All rights reserved.
:: Use of this source code is governed by a BSD-style license that can be
:: found in the LICENSE file.