Fixed whitespace issues for merge.

indra/llplugin/slplugin/slplugin-objc.h

@@ -48,4 +48,6 @@ class LLCocoaPlugin
     NSWindow* mFrontWindow;
     NSWindow* mPluginWindow;
     int mHackState;
-};
+};
\ No newline at end of file
+
+

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}

indra/mac_crash_logger/llcrashloggermacdelegate.h

@@ -47,4 +47,6 @@
 @property (assign) IBOutlet NSWindow *window;
 
 @end
-*/
+*/
\ No newline at end of file
+
+

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}

indra/mac_updater/MacUpdaterAppDelegate.h

@@ -55,4 +55,6 @@ LLMacUpdater mUpdater;
 
 @end
 
-#endif //LL_MAC_UPDATE_DELEGATE_H
+#endif //LL_MAC_UPDATE_DELEGATE_H
\ No newline at end of file
+
+

indra/mac_updater/mac_updater.h

@@ -86,4 +86,6 @@ class LLMacUpdater
     static LLMacUpdater *sInstance;
 
 };
-#endif
+#endif
\ No newline at end of file
+
+