diff options
| -rw-r--r-- | ThirdParty/TribalMedia/TribalMedia.Framework.Data/Properties/AssemblyInfo.cs | 6 | ||||
| -rw-r--r-- | prebuild.xml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/Properties/AssemblyInfo.cs b/ThirdParty/TribalMedia/TribalMedia.Framework.Data/Properties/AssemblyInfo.cs index 3a69f89..457624e 100644 --- a/ThirdParty/TribalMedia/TribalMedia.Framework.Data/Properties/AssemblyInfo.cs +++ b/ThirdParty/TribalMedia/TribalMedia.Framework.Data/Properties/AssemblyInfo.cs | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Tribal Media AB, http://tribalmedia.se/ |
| 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
| 4 | * | 3 | * |
| 5 | * Redistribution and use in source and binary forms, with or without | 4 | * Redistribution and use in source and binary forms, with or without |
| 6 | * modification, are permitted provided that the following conditions are met: | 5 | * modification, are permitted provided that the following conditions are met: |
| @@ -9,8 +8,7 @@ | |||
| 9 | * * Redistributions in binary form must reproduce the above copyright | 8 | * * Redistributions in binary form must reproduce the above copyright |
| 10 | * notice, this list of conditions and the following disclaimer in the | 9 | * notice, this list of conditions and the following disclaimer in the |
| 11 | * documentation and/or other materials provided with the distribution. | 10 | * documentation and/or other materials provided with the distribution. |
| 12 | * * Neither the name of the OpenSim Project nor the | 11 | * * The name of Tribal Media AB may not be used to endorse or promote products |
| 13 | * names of its contributors may be used to endorse or promote products | ||
| 14 | * derived from this software without specific prior written permission. | 12 | * derived from this software without specific prior written permission. |
| 15 | * | 13 | * |
| 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 14 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
diff --git a/prebuild.xml b/prebuild.xml index 9050074..11c3169 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -83,11 +83,13 @@ | |||
| 83 | <Configuration name="Debug"> | 83 | <Configuration name="Debug"> |
| 84 | <Options> | 84 | <Options> |
| 85 | <OutputPath>../../../bin/</OutputPath> | 85 | <OutputPath>../../../bin/</OutputPath> |
| 86 | <KeyFile>TribalMedia.Framework.Data.snk</KeyFile> | ||
| 86 | </Options> | 87 | </Options> |
| 87 | </Configuration> | 88 | </Configuration> |
| 88 | <Configuration name="Release"> | 89 | <Configuration name="Release"> |
| 89 | <Options> | 90 | <Options> |
| 90 | <OutputPath>../../../bin/</OutputPath> | 91 | <OutputPath>../../../bin/</OutputPath> |
| 92 | <KeyFile>TribalMedia.Framework.Data.snk</KeyFile> | ||
| 91 | </Options> | 93 | </Options> |
| 92 | </Configuration> | 94 | </Configuration> |
| 93 | 95 | ||
| @@ -102,7 +104,7 @@ | |||
| 102 | <Project name="OpenSim.Framework.Data" path="OpenSim/Framework/Data" type="Library"> | 104 | <Project name="OpenSim.Framework.Data" path="OpenSim/Framework/Data" type="Library"> |
| 103 | <Configuration name="Debug"> | 105 | <Configuration name="Debug"> |
| 104 | <Options> | 106 | <Options> |
| 105 | <OutputPath>../../../bin/</OutputPath> | 107 | <OutputPath>../../../bin/</OutputPath> |
| 106 | </Options> | 108 | </Options> |
| 107 | </Configuration> | 109 | </Configuration> |
| 108 | <Configuration name="Release"> | 110 | <Configuration name="Release"> |