diff options
| author | unknown | 2008-12-19 00:17:06 -0700 |
|---|---|---|
| committer | unknown | 2008-12-19 00:17:06 -0700 |
| commit | e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554 (patch) | |
| tree | f4ae195b239b9ae3ed8ca53c2dc6f20a24ff7dc7 /linden/indra/llcommon/llsecondlifeurls.cpp | |
| parent | fuckyougit (diff) | |
| parent | 1.1 wip copy (diff) | |
| download | meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.zip meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.gz meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.bz2 meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.xz | |
resolved merge conflicts
Diffstat (limited to 'linden/indra/llcommon/llsecondlifeurls.cpp')
| -rw-r--r-- | linden/indra/llcommon/llsecondlifeurls.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llcommon/llsecondlifeurls.cpp b/linden/indra/llcommon/llsecondlifeurls.cpp index ee478fe..b006a6a 100644 --- a/linden/indra/llcommon/llsecondlifeurls.cpp +++ b/linden/indra/llcommon/llsecondlifeurls.cpp | |||
| @@ -84,4 +84,4 @@ const std::string SL_KB_URL ( | |||
| 84 | "http://secondlife.com/knowledgebase/"); | 84 | "http://secondlife.com/knowledgebase/"); |
| 85 | 85 | ||
| 86 | const std::string RELEASE_NOTES_BASE_URL ( | 86 | const std::string RELEASE_NOTES_BASE_URL ( |
| 87 | "http://secondlife.com/app/releasenotes/"); | 87 | "http://imprudenceviewer.org/wiki/Release_Notes/"); |