summaryrefslogtreecommitdiff
path: root/indra/llvfs
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-09-03 20:12:47 +0000
committerDon Kjer <don@lindenlab.com>2012-09-03 20:12:47 +0000
commit403d1b6404355fa26b0bfeff206f5c56758a491c (patch)
tree6438eb8fa29dc8946d404ac79f89cf1bd140bbe1 /indra/llvfs
parent21c364c4d455cc05ec176032e8c090be0cc4ed50 (diff)
parent825cc7873251ad90720ab40221d689abed7b2ac8 (diff)
Merge VirLinden/sunshine -> don_linden/sunshine-experimental
Diffstat (limited to 'indra/llvfs')
-rw-r--r--indra/llvfs/lldir.h2
-rw-r--r--indra/llvfs/lldir_mac.cpp2
-rw-r--r--indra/llvfs/lldir_mac.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/llvfs/lldir.h b/indra/llvfs/lldir.h
index 5ee8bdb542..3b1883b5d8 100644
--- a/indra/llvfs/lldir.h
+++ b/indra/llvfs/lldir.h
@@ -1,4 +1,4 @@
-/**
+/**
* @file lldir.h
* @brief Definition of directory utilities class
*
diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp
index 489bc3e4a7..9f60111275 100644
--- a/indra/llvfs/lldir_mac.cpp
+++ b/indra/llvfs/lldir_mac.cpp
@@ -22,7 +22,7 @@
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
- */
+ */
#if LL_DARWIN
diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h
index d190d70be4..64e9485757 100644
--- a/indra/llvfs/lldir_mac.h
+++ b/indra/llvfs/lldir_mac.h
@@ -22,7 +22,7 @@
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
- */
+ */
#if !LL_DARWIN
#error This header must not be included when compiling for any target other than Mac OS. Consider including lldir.h instead.