[Pkg-owncloud-commits] [owncloud-client] 301/332: Merge remote-tracking branch 'origin/win_overlay_icons'

[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 4ad9ff430190a66b24910ba5bb6b20ccb8fbc469
Merge: fe3f751 c7ff1e9
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Tue Aug 5 19:27:51 2014 +0200

    Merge remote-tracking branch 'origin/win_overlay_icons'
    
    Conflicts:
    	.gitignore

 .gitignore                                         | 148 ++++++++
 .../OCShellExtensions/OCOverlays/DllMain.cpp       | 204 +++++++++++
 .../OCShellExtensions/OCOverlays/OCOverlay.cpp     | 157 +++++++++
 .../OCShellExtensions/OCOverlays/OCOverlay.h       |  52 +++
 .../OCShellExtensions/OCOverlays/OCOverlay.rc      | Bin 0 -> 4244 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                  | 197 +++++++++++
 .../OCOverlays/OverlayConstants.h                  |  47 +++
 .../OCOverlays/OverlayConstants.h.original         |  32 ++
 .../OCShellExtensions/OCOverlays/ico/Error.ico     | Bin 0 -> 30166 bytes
 .../OCOverlays/ico/Error_Shared.ico                | Bin 0 -> 30166 bytes
 .../OCShellExtensions/OCOverlays/ico/OK.ico        | Bin 0 -> 30166 bytes
 .../OCShellExtensions/OCOverlays/ico/OK_Shared.ico | Bin 0 -> 30166 bytes
 .../OCShellExtensions/OCOverlays/ico/Sync.ico      | Bin 0 -> 30166 bytes
 .../OCOverlays/ico/Sync_Shared.ico                 | Bin 0 -> 30166 bytes
 .../OCShellExtensions/OCOverlays/ico/Warning.ico   | Bin 0 -> 30166 bytes
 .../OCOverlays/ico/Warning_Shared.ico              | Bin 0 -> 30166 bytes
 .../OCShellExtensions/OCOverlays/resource.h        | Bin 0 -> 1536 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        | 159 +++++++++
 .../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 +
 46 files changed, 2801 insertions(+)

diff --cc .gitignore
index d01ed5e,e1cd730..5378559
--- a/.gitignore
+++ b/.gitignore
@@@ -16,5 -16,148 +16,153 @@@ build
  cscope.*
  tags
  t1.cfg
+ 
+ ## Ignore Visual Studio temporary files, build results, and
+ ## files generated by popular Visual Studio add-ons.
+ 
+ # User-specific files
+ *.suo
+ *.user
+ *.sln.docstates
+ 
+ # Build results
+ [Dd]ebug/
+ [Dd]ebugPublic/
+ [Rr]elease/
+ [Rr]eleases/
+ x64/
+ x86/
+ build/
+ bld/
+ [Bb]in/
+ [Oo]bj/
+ 
+ # Roslyn cache directories
+ *.ide/
+ 
+ # MSTest test Results
+ [Tt]est[Rr]esult*/
+ [Bb]uild[Ll]og.*
+ 
+ #NUNIT
+ *.VisualState.xml
+ TestResult.xml
+ 
+ # Build Results of an ATL Project
+ [Dd]ebugPS/
+ [Rr]eleasePS/
+ dlldata.c
+ 
+ *_i.c
+ *_p.c
+ *_i.h
+ *.ilk
+ *.meta
+ *.obj
+ *.pch
+ *.pdb
+ *.pgc
+ *.pgd
+ *.rsp
+ *.sbr
+ *.tlb
+ *.tli
+ *.tlh
+ *.tmp
+ *.tmp_proj
+ *.log
+ *.vspscc
+ *.vssscc
+ .builds
+ *.pidb
+ *.svclog
+ *.scc
+ 
++# Mac OS X specific
 +shell_integration/MacOSX/LiferayNativity.xcworkspace/xcuserdata/
 +**/.DS_Store
++
+ # Visual C++ cache files
+ ipch/
+ *.aps
+ *.ncb
+ *.opensdf
+ *.sdf
+ *.cachefile
+ 
+ # Visual Studio profiler
+ *.psess
+ *.vsp
+ *.vspx
+ 
+ # TFS 2012 Local Workspace
+ $tf/
+ 
+ # NCrunch
+ _NCrunch_*
+ .*crunch*.local.xml
+ 
+ # Web workbench (sass)
+ .sass-cache/
+ 
+ # Installshield output folder
+ [Ee]xpress/
+ 
+ # Click-Once directory
+ publish/
+ 
+ # Publish Web Output
+ *.[Pp]ublish.xml
+ *.azurePubxml
+ ## TODO: Comment the next line if you want to checkin your
+ ## web deploy settings but do note that will include unencrypted
+ ## passwords
+ *.pubxml
+ 
+ # NuGet Packages
+ packages/*
+ *.nupkg
+ ## TODO: If the tool you use requires repositories.config
+ ## uncomment the next line
+ #!packages/repositories.config
+ 
+ # Enable "build/" folder in the NuGet Packages folder since
+ # NuGet packages use it for MSBuild targets.
+ # This line needs to be after the ignore of the build folder
+ # (and the packages folder if the line above has been uncommented)
+ !packages/build/
+ 
+ # Windows Store app package directory
+ AppPackages/
+ 
+ # Others
+ sql/
+ *.Cache
+ ClientBin/
+ [Ss]tyle[Cc]op.*
+ ~$*
+ *~
+ *.dbmdl
+ *.dbproj.schemaview
+ *.pfx
+ *.publishsettings
+ node_modules/
+ 
+ # RIA/Silverlight projects
+ Generated_Code/
+ 
+ # Backup & report files from converting an old project file
+ # to a newer Visual Studio version. Backup files are not needed,
+ # because we have git ;-)
+ _UpgradeReport_Files/
+ Backup*/
+ UpgradeLog*.XML
+ UpgradeLog*.htm
+ 
+ # SQL Server files
+ *.mdf
+ *.ldf
+ 
+ # Microsoft Fakes
+ FakesAssemblies/
++

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