[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Sun Oct 24 23:02:27 CDT 2010
branch "master" has been updated
via d4d0c5f836792c2550341a964d3b0608d49f12ff (commit)
from 6a1bf786793a1675af2fb47f4a00ba1812725a6f (commit)
Summary of changes:
src/BridgeImpl.cpp | 14 +++++++++++---
src/BridgeManagerImpl.cpp | 14 +++++++++++---
src/BridgeManagerImpl.h | 14 +++++++++++---
src/MediaSplicer.cpp | 14 +++++++++++---
src/MediaSplicer.h | 14 +++++++++++---
src/Service.cpp | 14 +++++++++++---
test/BridgeListenerI.cpp | 14 +++++++++++---
test/BridgeListenerI.h | 14 +++++++++++---
test/BridgeManagerListenerI.cpp | 14 +++++++++++---
test/BridgeManagerListenerI.h | 14 +++++++++++---
test/TestCommandDriver.cpp | 14 +++++++++++---
test/TestCommandDriver.h | 14 +++++++++++---
test/channel_driver | 2 +-
13 files changed, 133 insertions(+), 37 deletions(-)
- Log -----------------------------------------------------------------
commit d4d0c5f836792c2550341a964d3b0608d49f12ff
Author: Ken Hunt <ken.hunt at digium.com>
Date: Sun Oct 24 22:25:29 2010 -0500
Updated copyright header to GPL V2.
diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index f1a7036..8df513f 100644
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#include "BridgeImpl.h"
#include "logger.h"
diff --git a/src/BridgeManagerImpl.cpp b/src/BridgeManagerImpl.cpp
index 7cbf235..66ea54e 100644
--- a/src/BridgeManagerImpl.cpp
+++ b/src/BridgeManagerImpl.cpp
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#include "BridgeManagerImpl.h"
#include <Ice/Ice.h>
diff --git a/src/BridgeManagerImpl.h b/src/BridgeManagerImpl.h
index f978c7f..fa62ae3 100644
--- a/src/BridgeManagerImpl.h
+++ b/src/BridgeManagerImpl.h
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#pragma once
diff --git a/src/MediaSplicer.cpp b/src/MediaSplicer.cpp
index 32ccb55..b2f02fd 100644
--- a/src/MediaSplicer.cpp
+++ b/src/MediaSplicer.cpp
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#include "MediaSplicer.h"
#include <IceUtil/Shared.h>
diff --git a/src/MediaSplicer.h b/src/MediaSplicer.h
index 7e05a11..afd3514 100644
--- a/src/MediaSplicer.h
+++ b/src/MediaSplicer.h
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#pragma once
diff --git a/src/Service.cpp b/src/Service.cpp
index b82d194..7ff2c09 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#include "BridgeManagerImpl.h"
diff --git a/test/BridgeListenerI.cpp b/test/BridgeListenerI.cpp
index 1e3cac7..e1cca9b 100644
--- a/test/BridgeListenerI.cpp
+++ b/test/BridgeListenerI.cpp
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#include "BridgeListenerI.h"
diff --git a/test/BridgeListenerI.h b/test/BridgeListenerI.h
index 1c8abf8..7f56615 100644
--- a/test/BridgeListenerI.h
+++ b/test/BridgeListenerI.h
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#pragma once
diff --git a/test/BridgeManagerListenerI.cpp b/test/BridgeManagerListenerI.cpp
index e26b62b..6aabf0e 100644
--- a/test/BridgeManagerListenerI.cpp
+++ b/test/BridgeManagerListenerI.cpp
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#include "BridgeManagerListenerI.h"
diff --git a/test/BridgeManagerListenerI.h b/test/BridgeManagerListenerI.h
index 34c7923..22d0dec 100644
--- a/test/BridgeManagerListenerI.h
+++ b/test/BridgeManagerListenerI.h
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#pragma once
diff --git a/test/TestCommandDriver.cpp b/test/TestCommandDriver.cpp
index 739bc7c..7d1da99 100644
--- a/test/TestCommandDriver.cpp
+++ b/test/TestCommandDriver.cpp
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#include "TestCommandDriver.h"
diff --git a/test/TestCommandDriver.h b/test/TestCommandDriver.h
index 0bfe3f9..7ba013f 100644
--- a/test/TestCommandDriver.h
+++ b/test/TestCommandDriver.h
@@ -1,9 +1,17 @@
/*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
*
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
*
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
*/
#pragma once
diff --git a/test/channel_driver b/test/channel_driver
index a8bcab4..6f7bcf6 160000
--- a/test/channel_driver
+++ b/test/channel_driver
@@ -1 +1 @@
-Subproject commit a8bcab4482bc3f079988b12f5ee78aa2a512b517
+Subproject commit 6f7bcf618f587e939743eb987af205bb5d114835
-----------------------------------------------------------------------
--
asterisk-scf/integration/bridging.git
More information about the asterisk-scf-commits
mailing list