Fixed whitespace issues for merge.

2282d6b1 · Aura Linden · e85e6ca4 · 2282d6b1 · 2282d6b1 · 2282d6b1
Commit 2282d6b1 authored 12 years ago by Aura Linden
--- a/indra/llplugin/slplugin/slplugin-objc.h
+++ b/indra/llplugin/slplugin/slplugin-objc.h
@@ -49,3 +49,5 @@ class LLCocoaPlugin
    NSWindow* mPluginWindow;
    int mHackState;
 };
--- a/indra/mac_crash_logger/CMakeLists.txt
+++ b/indra/mac_crash_logger/CMakeLists.txt
--- a/indra/mac_crash_logger/llcrashloggermacdelegate.h
+++ b/indra/mac_crash_logger/llcrashloggermacdelegate.h
@@ -48,3 +48,5 @@
 @end
 */
--- a/indra/mac_updater/CMakeLists.txt
+++ b/indra/mac_updater/CMakeLists.txt
--- a/indra/mac_updater/MacUpdaterAppDelegate.h
+++ b/indra/mac_updater/MacUpdaterAppDelegate.h
@@ -56,3 +56,5 @@ LLMacUpdater mUpdater;
 @end
 #endif //LL_MAC_UPDATE_DELEGATE_H
--- a/indra/mac_updater/mac_updater.h
+++ b/indra/mac_updater/mac_updater.h
@@ -87,3 +87,5 @@ class LLMacUpdater
 };
 #endif