diff options
| author | Jeff Ames | 2008-03-17 20:55:21 +0000 |
|---|---|---|
| committer | Jeff Ames | 2008-03-17 20:55:21 +0000 |
| commit | 79209c429705beb57ad9b787718856ab2c9fd37c (patch) | |
| tree | 6f459e172985bce8ffbfc09a5b9a4594dd881a62 /Prebuild/src/Core/Attributes | |
| parent | * More almost completely unproductive log message fiddling (diff) | |
| download | opensim-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/Core/Attributes')
| -rw-r--r-- | Prebuild/src/Core/Attributes/DataNodeAttribute.cs | 2 | ||||
| -rw-r--r-- | Prebuild/src/Core/Attributes/OptionNodeAttribute.cs | 2 | ||||
| -rw-r--r-- | Prebuild/src/Core/Attributes/TargetAttribute.cs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Prebuild/src/Core/Attributes/DataNodeAttribute.cs b/Prebuild/src/Core/Attributes/DataNodeAttribute.cs index 0786fe5..cdd0e0d 100644 --- a/Prebuild/src/Core/Attributes/DataNodeAttribute.cs +++ b/Prebuild/src/Core/Attributes/DataNodeAttribute.cs | |||
| @@ -27,7 +27,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O | |||
| 27 | /* | 27 | /* |
| 28 | * $Source$ | 28 | * $Source$ |
| 29 | * $Author: jendave $ | 29 | * $Author: jendave $ |
| 30 | * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $ | 30 | * $Date: 2006-01-28 09:49:58 +0900 (Sat, 28 Jan 2006) $ |
| 31 | * $Revision: 71 $ | 31 | * $Revision: 71 $ |
| 32 | */ | 32 | */ |
| 33 | #endregion | 33 | #endregion |
diff --git a/Prebuild/src/Core/Attributes/OptionNodeAttribute.cs b/Prebuild/src/Core/Attributes/OptionNodeAttribute.cs index a63e840..5cefe68 100644 --- a/Prebuild/src/Core/Attributes/OptionNodeAttribute.cs +++ b/Prebuild/src/Core/Attributes/OptionNodeAttribute.cs | |||
| @@ -27,7 +27,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O | |||
| 27 | /* | 27 | /* |
| 28 | * $Source$ | 28 | * $Source$ |
| 29 | * $Author: jendave $ | 29 | * $Author: jendave $ |
| 30 | * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $ | 30 | * $Date: 2006-01-28 09:49:58 +0900 (Sat, 28 Jan 2006) $ |
| 31 | * $Revision: 71 $ | 31 | * $Revision: 71 $ |
| 32 | */ | 32 | */ |
| 33 | #endregion | 33 | #endregion |
diff --git a/Prebuild/src/Core/Attributes/TargetAttribute.cs b/Prebuild/src/Core/Attributes/TargetAttribute.cs index 8724d69..b17cc5b 100644 --- a/Prebuild/src/Core/Attributes/TargetAttribute.cs +++ b/Prebuild/src/Core/Attributes/TargetAttribute.cs | |||
| @@ -27,7 +27,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O | |||
| 27 | /* | 27 | /* |
| 28 | * $Source$ | 28 | * $Source$ |
| 29 | * $Author: jendave $ | 29 | * $Author: jendave $ |
| 30 | * $Date: 2006-01-28 01:49:58 +0100 (lö, 28 jan 2006) $ | 30 | * $Date: 2006-01-28 09:49:58 +0900 (Sat, 28 Jan 2006) $ |
| 31 | * $Revision: 71 $ | 31 | * $Revision: 71 $ |
| 32 | */ | 32 | */ |
| 33 | #endregion | 33 | #endregion |