Skip to content

Commit

Permalink
Merge branch 'master' into qa
Browse files Browse the repository at this point in the history
Conflicts:
	README.markdown
  • Loading branch information
analogrelay committed Dec 9, 2013
2 parents 6597bef + 3340497 commit ade21cc
Show file tree
Hide file tree
Showing 66 changed files with 1,657 additions and 533 deletions.
72 changes: 51 additions & 21 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,22 +1,52 @@
# Auto detect text files and perform LF normalization
* text=auto
### Check me into the root of the repo
### as .gitattributes

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain

*.jpg binary
*.png binary
*.gif binary

*.cs text=auto diff=csharp
*.vb text=auto
*.c text=auto
*.cpp text=auto
*.cxx text=auto
*.h text=auto
*.hxx text=auto
*.py text=auto
*.rb text=auto
*.java text=auto
*.html text=auto
*.htm text=auto
*.css text=auto
*.scss text=auto
*.sass text=auto
*.less text=auto
*.js text=auto
*.lisp text=auto
*.clj text=auto
*.sql text=auto
*.php text=auto
*.lua text=auto
*.m text=auto
*.asm text=auto
*.erl text=auto
*.fs text=auto
*.fsx text=auto
*.hs text=auto

*.csproj text=auto merge=union
*.vbproj text=auto merge=union
*.fsproj text=auto merge=union
*.dbproj text=auto merge=union
*.sln -text merge=union
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.nuget/nuget.exe
nuget.exe

*.results.xml
_AzurePackage
Expand Down
145 changes: 0 additions & 145 deletions .nuget/NuGet.targets

This file was deleted.

Binary file removed .nuget/nuget.exe
Binary file not shown.
93 changes: 0 additions & 93 deletions NuGetGallery.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
# Visual Studio 2012
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{96E4AFF8-D3A1-4102-ADCF-05F186F916A9}"
ProjectSection(SolutionItems) = preProject
.nuget\packages.config = .nuget\packages.config
Expand Down Expand Up @@ -57,10 +56,6 @@ Global
{7F92C174-5310-4090-A6A3-3CC7C67C19D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7F92C174-5310-4090-A6A3-3CC7C67C19D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7F92C174-5310-4090-A6A3-3CC7C67C19D6}.Release|Any CPU.Build.0 = Release|Any CPU
{0EA1CBE8-DEFB-4D97-86E2-33657204C764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0EA1CBE8-DEFB-4D97-86E2-33657204C764}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0EA1CBE8-DEFB-4D97-86E2-33657204C764}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0EA1CBE8-DEFB-4D97-86E2-33657204C764}.Release|Any CPU.Build.0 = Release|Any CPU
{DBECF66B-8F2F-4B32-9143-E243BAFF12DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DBECF66B-8F2F-4B32-9143-E243BAFF12DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DBECF66B-8F2F-4B32-9143-E243BAFF12DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -97,94 +92,6 @@ Global
{1D0164B6-92D4-455A-AC68-C30B61733748}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D0164B6-92D4-455A-AC68-C30B61733748}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1D0164B6-92D4-455A-AC68-C30B61733748}.Release|Any CPU.Build.0 = Release|Any CPU
{1DACF781-5CD0-4123-8BAC-CD385D864BE5}.Debug|x64.ActiveCfg = Debug|Any CPU
{1DACF781-5CD0-4123-8BAC-CD385D864BE5}.Debug|x64.Build.0 = Debug|Any CPU
{1DACF781-5CD0-4123-8BAC-CD385D864BE5}.Debug|x86.ActiveCfg = Debug|Any CPU
{1DACF781-5CD0-4123-8BAC-CD385D864BE5}.Debug|x86.Build.0 = Debug|Any CPU
{1DACF781-5CD0-4123-8BAC-CD385D864BE5}.Release|x64.ActiveCfg = Release|Any CPU
{1DACF781-5CD0-4123-8BAC-CD385D864BE5}.Release|x64.Build.0 = Release|Any CPU
{1DACF781-5CD0-4123-8BAC-CD385D864BE5}.Release|x86.ActiveCfg = Release|Any CPU
{1DACF781-5CD0-4123-8BAC-CD385D864BE5}.Release|x86.Build.0 = Release|Any CPU
{FDC76BEF-3360-45AC-A13E-AE8F14D343D5}.Debug|x64.ActiveCfg = Debug|Any CPU
{FDC76BEF-3360-45AC-A13E-AE8F14D343D5}.Debug|x64.Build.0 = Debug|Any CPU
{FDC76BEF-3360-45AC-A13E-AE8F14D343D5}.Debug|x86.ActiveCfg = Debug|Any CPU
{FDC76BEF-3360-45AC-A13E-AE8F14D343D5}.Debug|x86.Build.0 = Debug|Any CPU
{FDC76BEF-3360-45AC-A13E-AE8F14D343D5}.Release|x64.ActiveCfg = Release|Any CPU
{FDC76BEF-3360-45AC-A13E-AE8F14D343D5}.Release|x64.Build.0 = Release|Any CPU
{FDC76BEF-3360-45AC-A13E-AE8F14D343D5}.Release|x86.ActiveCfg = Release|Any CPU
{FDC76BEF-3360-45AC-A13E-AE8F14D343D5}.Release|x86.Build.0 = Release|Any CPU
{7F92C174-5310-4090-A6A3-3CC7C67C19D6}.Debug|x64.ActiveCfg = Debug|Any CPU
{7F92C174-5310-4090-A6A3-3CC7C67C19D6}.Debug|x64.Build.0 = Debug|Any CPU
{7F92C174-5310-4090-A6A3-3CC7C67C19D6}.Debug|x86.ActiveCfg = Debug|Any CPU
{7F92C174-5310-4090-A6A3-3CC7C67C19D6}.Debug|x86.Build.0 = Debug|Any CPU
{7F92C174-5310-4090-A6A3-3CC7C67C19D6}.Release|x64.ActiveCfg = Release|Any CPU
{7F92C174-5310-4090-A6A3-3CC7C67C19D6}.Release|x64.Build.0 = Release|Any CPU
{7F92C174-5310-4090-A6A3-3CC7C67C19D6}.Release|x86.ActiveCfg = Release|Any CPU
{7F92C174-5310-4090-A6A3-3CC7C67C19D6}.Release|x86.Build.0 = Release|Any CPU
{0EA1CBE8-DEFB-4D97-86E2-33657204C764}.Debug|x64.ActiveCfg = Debug|Any CPU
{0EA1CBE8-DEFB-4D97-86E2-33657204C764}.Debug|x64.Build.0 = Debug|Any CPU
{0EA1CBE8-DEFB-4D97-86E2-33657204C764}.Debug|x86.ActiveCfg = Debug|Any CPU
{0EA1CBE8-DEFB-4D97-86E2-33657204C764}.Debug|x86.Build.0 = Debug|Any CPU
{0EA1CBE8-DEFB-4D97-86E2-33657204C764}.Release|x64.ActiveCfg = Release|Any CPU
{0EA1CBE8-DEFB-4D97-86E2-33657204C764}.Release|x64.Build.0 = Release|Any CPU
{0EA1CBE8-DEFB-4D97-86E2-33657204C764}.Release|x86.ActiveCfg = Release|Any CPU
{0EA1CBE8-DEFB-4D97-86E2-33657204C764}.Release|x86.Build.0 = Release|Any CPU
{DBECF66B-8F2F-4B32-9143-E243BAFF12DF}.Debug|x64.ActiveCfg = Debug|Any CPU
{DBECF66B-8F2F-4B32-9143-E243BAFF12DF}.Debug|x64.Build.0 = Debug|Any CPU
{DBECF66B-8F2F-4B32-9143-E243BAFF12DF}.Debug|x86.ActiveCfg = Debug|Any CPU
{DBECF66B-8F2F-4B32-9143-E243BAFF12DF}.Debug|x86.Build.0 = Debug|Any CPU
{DBECF66B-8F2F-4B32-9143-E243BAFF12DF}.Release|x64.ActiveCfg = Release|Any CPU
{DBECF66B-8F2F-4B32-9143-E243BAFF12DF}.Release|x64.Build.0 = Release|Any CPU
{DBECF66B-8F2F-4B32-9143-E243BAFF12DF}.Release|x86.ActiveCfg = Release|Any CPU
{DBECF66B-8F2F-4B32-9143-E243BAFF12DF}.Release|x86.Build.0 = Release|Any CPU
{F240D1BC-BBFB-4F22-9DF8-3FDE36BFD665}.Debug|x64.ActiveCfg = Debug|x64
{F240D1BC-BBFB-4F22-9DF8-3FDE36BFD665}.Debug|x64.Build.0 = Debug|x64
{F240D1BC-BBFB-4F22-9DF8-3FDE36BFD665}.Debug|x86.ActiveCfg = Debug|x86
{F240D1BC-BBFB-4F22-9DF8-3FDE36BFD665}.Debug|x86.Build.0 = Debug|x86
{F240D1BC-BBFB-4F22-9DF8-3FDE36BFD665}.Release|x64.ActiveCfg = Release|x64
{F240D1BC-BBFB-4F22-9DF8-3FDE36BFD665}.Release|x64.Build.0 = Release|x64
{F240D1BC-BBFB-4F22-9DF8-3FDE36BFD665}.Release|x86.ActiveCfg = Release|x86
{F240D1BC-BBFB-4F22-9DF8-3FDE36BFD665}.Release|x86.Build.0 = Release|x86
{097B2CDD-9623-4C34-93C2-D373D51F5B4E}.Debug|x64.ActiveCfg = Debug|Any CPU
{097B2CDD-9623-4C34-93C2-D373D51F5B4E}.Debug|x64.Build.0 = Debug|Any CPU
{097B2CDD-9623-4C34-93C2-D373D51F5B4E}.Debug|x86.ActiveCfg = Debug|Any CPU
{097B2CDD-9623-4C34-93C2-D373D51F5B4E}.Debug|x86.Build.0 = Debug|Any CPU
{097B2CDD-9623-4C34-93C2-D373D51F5B4E}.Release|x64.ActiveCfg = Release|Any CPU
{097B2CDD-9623-4C34-93C2-D373D51F5B4E}.Release|x64.Build.0 = Release|Any CPU
{097B2CDD-9623-4C34-93C2-D373D51F5B4E}.Release|x86.ActiveCfg = Release|Any CPU
{097B2CDD-9623-4C34-93C2-D373D51F5B4E}.Release|x86.Build.0 = Release|Any CPU
{4405C24C-7F57-4826-831F-D5D7E139F02E}.Debug|x64.ActiveCfg = Debug|Any CPU
{4405C24C-7F57-4826-831F-D5D7E139F02E}.Debug|x64.Build.0 = Debug|Any CPU
{4405C24C-7F57-4826-831F-D5D7E139F02E}.Debug|x86.ActiveCfg = Debug|Any CPU
{4405C24C-7F57-4826-831F-D5D7E139F02E}.Debug|x86.Build.0 = Debug|Any CPU
{4405C24C-7F57-4826-831F-D5D7E139F02E}.Release|x64.ActiveCfg = Release|Any CPU
{4405C24C-7F57-4826-831F-D5D7E139F02E}.Release|x64.Build.0 = Release|Any CPU
{4405C24C-7F57-4826-831F-D5D7E139F02E}.Release|x86.ActiveCfg = Release|Any CPU
{4405C24C-7F57-4826-831F-D5D7E139F02E}.Release|x86.Build.0 = Release|Any CPU
{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Debug|x64.ActiveCfg = Debug|Any CPU
{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Debug|x64.Build.0 = Debug|Any CPU
{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Debug|x86.ActiveCfg = Debug|Any CPU
{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Debug|x86.Build.0 = Debug|Any CPU
{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Release|x64.ActiveCfg = Release|Any CPU
{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Release|x64.Build.0 = Release|Any CPU
{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Release|x86.ActiveCfg = Release|Any CPU
{8AC9E39E-366C-47E5-80AE-38E71CD31386}.Release|x86.Build.0 = Release|Any CPU
{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Debug|x64.ActiveCfg = Debug|Any CPU
{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Debug|x64.Build.0 = Debug|Any CPU
{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Debug|x86.ActiveCfg = Debug|Any CPU
{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Debug|x86.Build.0 = Debug|Any CPU
{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Release|x64.ActiveCfg = Release|Any CPU
{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Release|x64.Build.0 = Release|Any CPU
{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Release|x86.ActiveCfg = Release|Any CPU
{0A6B1A52-4D26-4946-9DDD-416D01A1ADBF}.Release|x86.Build.0 = Release|Any CPU
{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Debug|x64.ActiveCfg = Debug|Any CPU
{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Debug|x64.Build.0 = Debug|Any CPU
{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Debug|x86.ActiveCfg = Debug|Any CPU
{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Debug|x86.Build.0 = Debug|Any CPU
{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Release|x64.ActiveCfg = Release|Any CPU
{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Release|x64.Build.0 = Release|Any CPU
{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Release|x86.ActiveCfg = Release|Any CPU
{8FB56455-C688-44AE-95F1-48FFCB199BFE}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading

0 comments on commit ade21cc

Please sign in to comment.