Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
author: Melanie 2013-01-10 01:38:03 +0000
committer: Melanie 2013-01-10 01:38:03 +0000
commit: 3a495ccd561c9e1e95407d8657065265176a03dd (patch)
tree: cb7e7343e7c9a15bfdd77632d389fc6b6288b709 /OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
parent: Merge branch 'avination' into careminster (diff)
parent: On baked texture save, replace any HG ID with an ordinary asset ID so the HGA... (diff)
download: opensim-SC-3a495ccd561c9e1e95407d8657065265176a03dd.zip
opensim-SC-3a495ccd561c9e1e95407d8657065265176a03dd.tar.gz
opensim-SC-3a495ccd561c9e1e95407d8657065265176a03dd.tar.bz2
opensim-SC-3a495ccd561c9e1e95407d8657065265176a03dd.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index befb076..794ee17 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -6,7 +6,7 @@
 * 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.
- *     * Redistributions in binary form must reproduce the above copyrightD
+ *     * Redistributions in binary form must reproduce the above 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 OpenSimulator Project nor the
author	Melanie	2013-01-10 01:38:03 +0000
committer	Melanie	2013-01-10 01:38:03 +0000
commit	3a495ccd561c9e1e95407d8657065265176a03dd (patch)
tree	cb7e7343e7c9a15bfdd77632d389fc6b6288b709 /OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
parent	Merge branch 'avination' into careminster (diff)
parent	On baked texture save, replace any HG ID with an ordinary asset ID so the HGA... (diff)
download	opensim-SC-3a495ccd561c9e1e95407d8657065265176a03dd.zip opensim-SC-3a495ccd561c9e1e95407d8657065265176a03dd.tar.gz opensim-SC-3a495ccd561c9e1e95407d8657065265176a03dd.tar.bz2 opensim-SC-3a495ccd561c9e1e95407d8657065265176a03dd.tar.xz

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs index befb076..794ee17 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -6,7 +6,7 @@
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyrightD	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSimulator Project nor the	12	* * Neither the name of the OpenSimulator Project nor the