aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Prebuild/src/Properties
diff options
context:
space:
mode:
authorJeff Ames2008-03-17 20:55:21 +0000
committerJeff Ames2008-03-17 20:55:21 +0000
commit79209c429705beb57ad9b787718856ab2c9fd37c (patch)
tree6f459e172985bce8ffbfc09a5b9a4594dd881a62 /Prebuild/src/Properties
parent* More almost completely unproductive log message fiddling (diff)
downloadopensim-SC-79209c429705beb57ad9b787718856ab2c9fd37c.zip
opensim-SC-79209c429705beb57ad9b787718856ab2c9fd37c.tar.gz
opensim-SC-79209c429705beb57ad9b787718856ab2c9fd37c.tar.bz2
opensim-SC-79209c429705beb57ad9b787718856ab2c9fd37c.tar.xz
Merged changes in Prebuild trunk up to r258 into OpenSim's Prebuild.
Hopefully this should make merging upstream easier. Building with NAnt should still work, but Visual Studio is untested.
Diffstat (limited to 'Prebuild/src/Properties')
-rw-r--r--Prebuild/src/Properties/AssemblyInfo.cs64
1 files changed, 42 insertions, 22 deletions
diff --git a/Prebuild/src/Properties/AssemblyInfo.cs b/Prebuild/src/Properties/AssemblyInfo.cs
index 9f74500..e49aea5 100644
--- a/Prebuild/src/Properties/AssemblyInfo.cs
+++ b/Prebuild/src/Properties/AssemblyInfo.cs
@@ -1,34 +1,49 @@
1#region BSD License 1#region BSD License
2/* 2/*
3Copyright (c) 2004-2005 Matthew Holmes (matthew@wildfiregames.com), Dan Moorehead (dan05a@gmail.com)
4 3
5Redistribution and use in source and binary forms, with or without modification, are permitted 4Copyright (c) 2004 - 2008
6provided that the following conditions are met: 5Matthew Holmes (matthew@wildfiregames.com),
6Dan Moorehead (dan05a@gmail.com),
7Dave Hudson (jendave@yahoo.com),
8Rob Loach (http://www.robloach.net),
9C.J. Adams-Collier (cjac@colliertech.org),
7 10
8* Redistributions of source code must retain the above copyright notice, this list of conditions 11Redistribution and use in source and binary forms, with or without
9 and the following disclaimer. 12modification, are permitted provided that the following conditions are
10* Redistributions in binary form must reproduce the above copyright notice, this list of conditions 13met:
11 and the following disclaimer in the documentation and/or other materials provided with the 14
12 distribution. 15* Redistributions of source code must retain the above copyright
13* The name of the author may not be used to endorse or promote products derived from this software 16 notice, this list of conditions and the following disclaimer.
14 without specific prior written permission. 17
18* Redistributions in binary form must reproduce the above copyright
19 notice, this list of conditions and the following disclaimer in the
20 documentation and/or other materials provided with the distribution.
21
22* The name of the author may not be used to endorse or promote
23 products derived from this software without specific prior written
24 permission.
25
26THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
27IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
28WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
29DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
30INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
31(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
32SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
34STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
35IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
36POSSIBILITY OF SUCH DAMAGE.
15 37
16THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
17BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
18ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
22IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23*/ 38*/
24#endregion 39#endregion
25 40
26#region CVS Information 41#region CVS Information
27/* 42/*
28 * $Source$ 43 * $Source$
29 * $Author: jendave $ 44 * $Author: cjcollier $
30 * $Date: 2007-01-26 19:31:34 +0100 (fr, 26 jan 2007) $ 45 * $Date: 2008-02-08 01:31:29 +0900 (Fri, 08 Feb 2008) $
31 * $Revision: 203 $ 46 * $Revision: 256 $
32 */ 47 */
33#endregion 48#endregion
34 49
@@ -55,11 +70,16 @@ using System.Resources;
55[assembly: AssemblyConfiguration(".NET CLR")] 70[assembly: AssemblyConfiguration(".NET CLR")]
56[assembly: AssemblyCompany("The Prebuild Project")] 71[assembly: AssemblyCompany("The Prebuild Project")]
57[assembly: AssemblyProduct("")] 72[assembly: AssemblyProduct("")]
58[assembly: AssemblyCopyright("Copyright 2004-2006 Matthew Holmes, Dan Moorehead and David Hudson")] 73[assembly: AssemblyCopyright("Copyright 2004-2008 " +
74 "Matthew Holmes, " +
75 "Dan Moorehead, " +
76 "C.J. Adams-Collier, " +
77 "Rob Loach, " +
78 "David Hudson,")]
59[assembly: AssemblyTrademark("")] 79[assembly: AssemblyTrademark("")]
60[assembly: AssemblyCulture("")] 80[assembly: AssemblyCulture("")]
61[assembly: NeutralResourcesLanguageAttribute("en-US")] 81[assembly: NeutralResourcesLanguageAttribute("en-US")]
62[assembly: AssemblyVersion("2.0.0.*")] 82[assembly: AssemblyVersion("2.0.3.*")]
63 83
64// 84//
65// Version information for an assembly consists of the following four values: 85// Version information for an assembly consists of the following four values: