Skip to content

Commit 34dd463

Browse files
eman1986eman1986
authored
Merge pull request #199 from dotnet-ad/develop
0.9.5
2 parents 82b229d + 9fe70a9 commit 34dd463

File tree

76 files changed

+318
-14543
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+318
-14543
lines changed

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,9 @@ paket-files/
9090

9191
# Mac folder file
9292
.DS_Store
93+
94+
95+
# this file can be merge conflict hell, never commit these.
96+
Sources/Microcharts.Droid/Resources/Resource.designer.cs
97+
Sources/Microcharts.Samples.Droid/Resources/Resource.designer.cs
98+
Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/Resource.designer.cs

‎Documentation/.gitignore

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎Documentation/api/.gitignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎Documentation/api/.manifest

Lines changed: 0 additions & 102 deletions
This file was deleted.

‎Documentation/docfx.json

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎Documentation/guides/quickstart.md

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎Documentation/guides/toc.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎Documentation/images/Android-Screenshot.png

-40.2 KB
Binary file not shown.

‎Documentation/images/Bar.png

-5.34 KB
Binary file not shown.

‎Documentation/images/Bikr.gif

-1.58 MB
Binary file not shown.

0 commit comments

Comments
 (0)