diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-15 13:10:21 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-15 13:10:21 -0400 |
| commit | 30ce56e7219b3d2ed16acb322cecec781c3776c5 (patch) | |
| tree | 3ab732fc9c8775a3fab0a705b4496ea21c1ab128 /OpenSim/Framework/Servers/BaseOpenSimServer.cs | |
| parent | * part one of adding physics combining (diff) | |
| parent | * whoops, missing a / (diff) | |
| download | opensim-SC-30ce56e7219b3d2ed16acb322cecec781c3776c5.zip opensim-SC-30ce56e7219b3d2ed16acb322cecec781c3776c5.tar.gz opensim-SC-30ce56e7219b3d2ed16acb322cecec781c3776c5.tar.bz2 opensim-SC-30ce56e7219b3d2ed16acb322cecec781c3776c5.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/BaseOpenSimServer.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 2a97528..7a244ff 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -443,7 +443,7 @@ namespace OpenSim.Framework.Servers | |||
| 443 | string inputLine; | 443 | string inputLine; |
| 444 | int strcmp; | 444 | int strcmp; |
| 445 | 445 | ||
| 446 | if (File.Exists( gitCommitFileName)) | 446 | if (File.Exists(gitCommitFileName)) |
| 447 | { | 447 | { |
| 448 | StreamReader CommitFile = File.OpenText(gitCommitFileName); | 448 | StreamReader CommitFile = File.OpenText(gitCommitFileName); |
| 449 | buildVersion = Environment.NewLine + "git# " + CommitFile.ReadLine(); | 449 | buildVersion = Environment.NewLine + "git# " + CommitFile.ReadLine(); |