[Pkg-owncloud-commits] [owncloud-client] 04/04: Merge branch 'upstream'

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit f7811426d359a4b6a1442c5f5470526e90df8b94
Merge: 379861a 539c24f
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat Aug 16 01:54:10 2014 +0200

    Merge branch 'upstream'

 shell_integration/MacOSX/CMakeLists.txt            |   11 -
 .../contents.xcworkspacedata                       |   10 -
 .../xcdebugger/Breakpoints.xcbkptlist              |   20 -
 .../MacOSX/LiferayNativityFinder/ContentManager.h  |   43 -
 .../MacOSX/LiferayNativityFinder/ContentManager.m  |  342 -
 .../LiferayNativityFinder/ContextMenuHandlers.h    |   28 -
 .../LiferayNativityFinder/ContextMenuHandlers.m    |  106 -
 .../ContextMenuHandlers.m.unc                      |   74 -
 .../LiferayNativityFinder/English.lproj/.DS_Store  |  Bin 6148 -> 0 bytes
 .../English.lproj/InfoPlist.strings                |    2 -
 .../MacOSX/LiferayNativityFinder/Finder/.DS_Store  |  Bin 6148 -> 0 bytes
 .../MacOSX/LiferayNativityFinder/Finder/Finder.h   | 1016 ---
 .../MacOSX/LiferayNativityFinder/FinderHook.h      |   22 -
 .../MacOSX/LiferayNativityFinder/FinderHook.m      |  125 -
 .../MacOSX/LiferayNativityFinder/GCDAsyncSocket.h  |  963 ---
 .../MacOSX/LiferayNativityFinder/GCDAsyncSocket.m  | 6969 --------------------
 .../MacOSX/LiferayNativityFinder/IconCache.h       |   29 -
 .../MacOSX/LiferayNativityFinder/IconCache.m       |  115 -
 .../LiferayNativityFinder/IconOverlayHandlers.h    |   23 -
 .../LiferayNativityFinder/IconOverlayHandlers.m    |  159 -
 .../MacOSX/LiferayNativityFinder/Info.plist        |   46 -
 .../MacOSX/LiferayNativityFinder/JSONKit.h         |  251 -
 .../MacOSX/LiferayNativityFinder/JSONKit.m         | 3065 ---------
 .../project.pbxproj                                |  339 -
 .../project.xcworkspace/contents.xcworkspacedata   |    7 -
 .../LiferayNativityFinder.xcodeproj/svp.mode1v3    | 1542 -----
 .../LiferayNativityFinder.xcodeproj/svp.pbxuser    | 1899 ------
 .../xcschemes/xcschememanagement.plist             |   14 -
 .../MacOSX/LiferayNativityFinder/MenuManager.h     |   29 -
 .../MacOSX/LiferayNativityFinder/MenuManager.m     |  188 -
 .../MacOSX/LiferayNativityFinder/RequestManager.h  |   40 -
 .../MacOSX/LiferayNativityFinder/RequestManager.m  |  230 -
 .../English.lproj/InfoPlist.strings                |    2 -
 .../MacOSX/LiferayNativityInjector/Info.plist      |   59 -
 .../LNStandardVersionComparator.h                  |   35 -
 .../LNStandardVersionComparator.m                  |  158 -
 .../LNVersionComparisonProtocol.h                  |   27 -
 .../LiferayNativityInjector.m                      |  270 -
 .../LiferayNativityInjector.sdef                   |    9 -
 .../project.pbxproj                                |  269 -
 .../project.xcworkspace/contents.xcworkspacedata   |    7 -
 .../xcschemes/LiferayNativity.osax.xcscheme        |   73 -
 .../xcschemes/xcschememanagement.plist             |   14 -
 .../MacOSX/LiferayNativityInjector/license.txt     |   25 -
 shell_integration/MacOSX/check.scpt                |    9 -
 shell_integration/MacOSX/deploy.sh                 |   11 -
 shell_integration/MacOSX/load.scpt                 |    6 -
 shell_integration/MacOSX/loadPlugin.sh             |    8 -
 shell_integration/MacOSX/unload.scpt               |    6 -
 .../OCShellExtensions/OCOverlays/DllMain.cpp       |  204 -
 .../OCShellExtensions/OCOverlays/OCOverlay.cpp     |  187 -
 .../OCShellExtensions/OCOverlays/OCOverlay.h       |   50 -
 .../OCShellExtensions/OCOverlays/OCOverlay.rc      |  Bin 4244 -> 0 bytes
 .../OCOverlays/OCOverlayFactory.cpp                |   91 -
 .../OCOverlays/OCOverlayFactory.h                  |   48 -
 .../OCOverlays/OCOverlayRegistrationHandler.cpp    |  149 -
 .../OCOverlays/OCOverlayRegistrationHandler.h      |   31 -
 .../OCShellExtensions/OCOverlays/OCOverlays.def    |    6 -
 .../OCOverlays/OCOverlays.vcxproj                  |  198 -
 .../OCOverlays/OverlayConstants.h                  |   47 -
 .../OCOverlays/OverlayConstants.h.original         |   32 -
 .../OCShellExtensions/OCOverlays/ico/Error.ico     |  Bin 30166 -> 0 bytes
 .../OCOverlays/ico/Error_Shared.ico                |  Bin 30166 -> 0 bytes
 .../OCShellExtensions/OCOverlays/ico/OK.ico        |  Bin 30166 -> 0 bytes
 .../OCShellExtensions/OCOverlays/ico/OK_Shared.ico |  Bin 30166 -> 0 bytes
 .../OCShellExtensions/OCOverlays/ico/Sync.ico      |  Bin 30166 -> 0 bytes
 .../OCOverlays/ico/Sync_Shared.ico                 |  Bin 30166 -> 0 bytes
 .../OCShellExtensions/OCOverlays/ico/Warning.ico   |  Bin 30166 -> 0 bytes
 .../OCOverlays/ico/Warning_Shared.ico              |  Bin 30166 -> 0 bytes
 .../OCShellExtensions/OCOverlays/resource.h        |  Bin 1536 -> 0 bytes
 .../windows/OCShellExtensions/OCOverlays/stdafx.h  |   30 -
 .../OCShellExtensions/OCShellExtensions.sln        |   41 -
 .../OCUtil/CommunicationSocket.cpp                 |  129 -
 .../OCShellExtensions/OCUtil/CommunicationSocket.h |   42 -
 .../windows/OCShellExtensions/OCUtil/FileUtil.cpp  |   84 -
 .../windows/OCShellExtensions/OCUtil/FileUtil.h    |   40 -
 .../windows/OCShellExtensions/OCUtil/OCMessage.cpp |   74 -
 .../windows/OCShellExtensions/OCUtil/OCMessage.h   |   42 -
 .../OCShellExtensions/OCUtil/OCUtil.vcxproj        |  160 -
 .../OCShellExtensions/OCUtil/ParserUtil.cpp        |  389 --
 .../OCShellExtensions/OCUtil/RegistryUtil.cpp      |   70 -
 .../OCShellExtensions/OCUtil/RegistryUtil.h        |   35 -
 .../OCShellExtensions/OCUtil/RemotePathChecker.cpp |  127 -
 .../OCShellExtensions/OCUtil/RemotePathChecker.h   |   42 -
 .../OCShellExtensions/OCUtil/StringUtil.cpp        |   32 -
 .../windows/OCShellExtensions/OCUtil/StringUtil.h  |   35 -
 .../OCShellExtensions/OCUtil/UtilConstants.h       |   30 -
 .../OCShellExtensions/OCUtilTest/OCUtilTest.cpp    |   37 -
 .../OCUtilTest/OCUtilTest.filters                  |   33 -
 .../OCUtilTest/OCUtilTest.vcxproj                  |   97 -
 .../OCShellExtensions/OCUtilTest/ReadMe.txt        |   40 -
 .../OCShellExtensions/OCUtilTest/stdafx.cpp        |    8 -
 .../windows/OCShellExtensions/OCUtilTest/stdafx.h  |   15 -
 .../OCShellExtensions/OCUtilTest/targetver.h       |    8 -
 94 files changed, 21378 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git