|
Merge branch 'develop' of https://github.com/ClosedXML/ClosedXML into pivotfield_sort
# Conflicts: # ClosedXML_Tests/Resource/Examples/PivotTables/PivotTables.xlsx |
|---|
| ClosedXML/ClosedXML.csproj |
|---|
| ClosedXML/Excel/CalcEngine/Expression.cs |
|---|
| ClosedXML/Excel/CalcEngine/Functions/Text.cs |
|---|
| ClosedXML/Excel/Cells/XLCell.cs |
|---|
| ClosedXML/Excel/ConditionalFormats/XLConditionalFormat.cs |
|---|
| ClosedXML/Excel/ConditionalFormats/XLConditionalFormats.cs |
|---|
| ClosedXML/Excel/PivotTables/XLPivotTable.cs |
|---|
| ClosedXML/Excel/XLWorkbook_Load.cs |
|---|
| ClosedXML/Excel/XLWorkbook_Save.cs |
|---|
| ClosedXML/Excel/XLWorksheet.cs |
|---|
| ClosedXML/Extensions.cs |
|---|
| ClosedXML/Extensions/FormatExtensions.cs 0 → 100644 |
|---|
| ClosedXML/Utils/XmlEncoder.cs |
|---|
| ClosedXML/packages.config |
|---|
| ClosedXML_Tests/ClosedXML_Tests.csproj |
|---|
| ClosedXML_Tests/Excel/CalcEngine/TextTests.cs |
|---|
| ClosedXML_Tests/Excel/ConditionalFormats/ConditionalFormatsConsolidateTests.cs 0 → 100644 |
|---|
| ClosedXML_Tests/Excel/PivotTables/XLPivotTableTests.cs |
|---|
| ClosedXML_Tests/Excel/Ranges/CopyingRangesTests.cs |
|---|
| ClosedXML_Tests/Excel/Saving/SavingTests.cs |
|---|
| ClosedXML_Tests/Excel/Styles/NumberFormatTests.cs |
|---|