diff options
author | Daniel Molkentin <danimo@owncloud.com> | 2014-08-05 21:27:51 +0400 |
---|---|---|
committer | Daniel Molkentin <danimo@owncloud.com> | 2014-08-05 21:27:51 +0400 |
commit | 4ad9ff430190a66b24910ba5bb6b20ccb8fbc469 (patch) | |
tree | 93d87a807ee27ccf545604af0406a73c17b2fab9 /.gitignore | |
parent | fe3f751a8aa83bc6d309d807102381ad81001bd2 (diff) | |
parent | c7ff1e9b3fc5d1d1ff186390ace1ffd0017109b1 (diff) |
Merge remote-tracking branch 'origin/win_overlay_icons'
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 148 |
1 files changed, 148 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index d01ed5e32..5378559c6 100644 --- a/.gitignore +++ b/.gitignore @@ -16,5 +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/ + |