diff options
| author | David Seikel | 2011-02-25 05:58:41 +1000 |
|---|---|---|
| committer | David Seikel | 2011-02-25 05:58:41 +1000 |
| commit | 8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f (patch) | |
| tree | 4cd1855e1658704d5eedd72dc64a95bc08b6c206 /linden/indra/newview/macview_Prefix.h | |
| parent | Merge branch 'weekly' into branding (diff) | |
| download | meta-impy-8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f.zip meta-impy-8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f.tar.gz meta-impy-8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f.tar.bz2 meta-impy-8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f.tar.xz | |
Unbranding. Todays word is "linden".
Diffstat (limited to 'linden/indra/newview/macview_Prefix.h')
| -rw-r--r-- | linden/indra/newview/macview_Prefix.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/macview_Prefix.h b/linden/indra/newview/macview_Prefix.h index 8cbabb5..5a895b2 100644 --- a/linden/indra/newview/macview_Prefix.h +++ b/linden/indra/newview/macview_Prefix.h | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | * $/LicenseInfo$ | 30 | * $/LicenseInfo$ |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | // MBW -- This doesn't work. There are some conflicts between things in Carbon.h and some of the linden source. | 33 | // MBW -- This doesn't work. There are some conflicts between things in Carbon.h and some of the viewer source. |
| 34 | //#include <Carbon/Carbon.h> | 34 | //#include <Carbon/Carbon.h> |
| 35 | 35 | ||
| 36 | ////////////////// From llagent.cpp | 36 | ////////////////// From llagent.cpp |