From 2282d6b11a2d46387514c9a352b4ccae5fa6e5d9 Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Thu, 13 Dec 2012 12:24:17 -0800
Subject: [PATCH] Fixed whitespace issues for merge.
---
indra/llplugin/slplugin/slplugin-objc.h | 4 +++-
indra/mac_crash_logger/CMakeLists.txt | 6 +++---
indra/mac_crash_logger/llcrashloggermacdelegate.h | 4 +++-
indra/mac_updater/CMakeLists.txt | 8 ++++----
indra/mac_updater/MacUpdaterAppDelegate.h | 4 +++-
indra/mac_updater/mac_updater.h | 4 +++-
6 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/indra/llplugin/slplugin/slplugin-objc.h b/indra/llplugin/slplugin/slplugin-objc.h
index 9a8e81873ff..f2c2b3239c8 100644
--- a/indra/llplugin/slplugin/slplugin-objc.h
+++ b/indra/llplugin/slplugin/slplugin-objc.h
@@ -48,4 +48,6 @@ class LLCocoaPlugin
NSWindow* mFrontWindow;
NSWindow* mPluginWindow;
int mHackState;
-};
\ No newline at end of file
+};
+
+
diff --git a/indra/mac_crash_logger/CMakeLists.txt b/indra/mac_crash_logger/CMakeLists.txt
index 87ee344598d..3906a3bb8c8 100644
--- a/indra/mac_crash_logger/CMakeLists.txt
+++ b/indra/mac_crash_logger/CMakeLists.txt
@@ -23,14 +23,14 @@ include_directories(
set(mac_crash_logger_SOURCE_FILES
mac_crash_logger.cpp
llcrashloggermac.cpp
- llcrashloggermacdelegate.mm
- )
+ llcrashloggermacdelegate.mm
+ )
set(mac_crash_logger_HEADER_FILES
CMakeLists.txt
llcrashloggermac.h
- llcrashloggermacdelegate.h
+ llcrashloggermacdelegate.h
)
set_source_files_properties(${mac_crash_logger_HEADER_FILES}
diff --git a/indra/mac_crash_logger/llcrashloggermacdelegate.h b/indra/mac_crash_logger/llcrashloggermacdelegate.h
index 8557b77e7d9..c998a8efe24 100644
--- a/indra/mac_crash_logger/llcrashloggermacdelegate.h
+++ b/indra/mac_crash_logger/llcrashloggermacdelegate.h
@@ -47,4 +47,6 @@
@property (assign) IBOutlet NSWindow *window;
@end
-*/
\ No newline at end of file
+*/
+
+
diff --git a/indra/mac_updater/CMakeLists.txt b/indra/mac_updater/CMakeLists.txt
index 4f39e941a10..7382e912bfc 100644
--- a/indra/mac_updater/CMakeLists.txt
+++ b/indra/mac_updater/CMakeLists.txt
@@ -19,13 +19,13 @@ include_directories(
set(mac_updater_SOURCE_FILES
main.m
- MacUpdaterAppDelegate.mm
- mac_updater.cpp
+ MacUpdaterAppDelegate.mm
+ mac_updater.cpp
)
set(mac_updater_HEADER_FILES
MacUpdaterAppDelegate.h
- mac_updater.h
+ mac_updater.h
CMakeLists.txt
)
@@ -63,7 +63,7 @@ target_link_libraries(mac-updater
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${COCOA_LIBRARIES}
- ${BOOST_FILESYSTEM_LIBRARY}
+ ${BOOST_FILESYSTEM_LIBRARY}
${IOKIT_LIBRARY}
${CURL_LIBRARIES}
${CARES_LIBRARIES}
diff --git a/indra/mac_updater/MacUpdaterAppDelegate.h b/indra/mac_updater/MacUpdaterAppDelegate.h
index ba5744b398c..c051214bb8a 100644
--- a/indra/mac_updater/MacUpdaterAppDelegate.h
+++ b/indra/mac_updater/MacUpdaterAppDelegate.h
@@ -55,4 +55,6 @@ LLMacUpdater mUpdater;
@end
-#endif //LL_MAC_UPDATE_DELEGATE_H
\ No newline at end of file
+#endif //LL_MAC_UPDATE_DELEGATE_H
+
+
diff --git a/indra/mac_updater/mac_updater.h b/indra/mac_updater/mac_updater.h
index 758d2750aae..f65b481cb68 100644
--- a/indra/mac_updater/mac_updater.h
+++ b/indra/mac_updater/mac_updater.h
@@ -86,4 +86,6 @@ class LLMacUpdater
static LLMacUpdater *sInstance;
};
-#endif
\ No newline at end of file
+#endif
+
+
--
GitLab