diff options
| author | Aura Linden <aura@lindenlab.com> | 2012-12-13 12:24:17 -0800 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2012-12-13 12:24:17 -0800 |
| commit | 2282d6b11a2d46387514c9a352b4ccae5fa6e5d9 (patch) | |
| tree | 533ad5cb3b9a3d4f5445d0d11f673994d89c0eba /indra/mac_updater | |
| parent | e85e6ca4104df14b0bb2d625d82578c81430d28e (diff) | |
Fixed whitespace issues for merge.
Diffstat (limited to 'indra/mac_updater')
| -rw-r--r-- | indra/mac_updater/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | indra/mac_updater/MacUpdaterAppDelegate.h | 4 | ||||
| -rw-r--r-- | indra/mac_updater/mac_updater.h | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/indra/mac_updater/CMakeLists.txt b/indra/mac_updater/CMakeLists.txt index 4f39e941a1..7382e912bf 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 ba5744b398..c051214bb8 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 758d2750aa..f65b481cb6 100644 --- a/indra/mac_updater/mac_updater.h +++ b/indra/mac_updater/mac_updater.h @@ -86,4 +86,6 @@ public: static LLMacUpdater *sInstance; }; -#endif
\ No newline at end of file +#endif + + |