diff options
| author | Matt Ward <matt.ward@xamarin.com> | 2016-12-09 21:12:25 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@xamarin.com> | 2016-12-09 21:12:25 +0300 |
| commit | 40d078b1421c09efb4b04e1bdf8f6ad9cecbc34d (patch) | |
| tree | 57d5002eeb94ab7dd0b02e8bfa55ea752ea8caec /main/src/core/MonoDevelop.Ide/icons | |
| parent | c6fdc5c197dfa293cd29824a7e54504748f83fbd (diff) | |
| parent | 46c45bf316c19b3140476cd55d7cdf7a8d8c48fe (diff) | |
Merge remote-tracking branch 'monodevelop/dotnetcore' into vNext
Conflicts:
main/Main.sln
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplatePackageReference.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
version-checks
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/icons')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16.png | bin | 0 -> 131 bytes |
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16@2x.png | bin | 0 -> 159 bytes |
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~dark.png | bin | 0 -> 131 bytes |
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~dark@2x.png | bin | 0 -> 159 bytes |
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~dark~sel.png | bin | 0 -> 131 bytes |
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~dark~sel@2x.png | bin | 0 -> 159 bytes |
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~sel.png | bin | 0 -> 131 bytes |
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~sel@2x.png | bin | 0 -> 159 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16.png b/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16.png Binary files differnew file mode 100644 index 0000000000..0cb309a601 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16@2x.png Binary files differnew file mode 100644 index 0000000000..c04287ac72 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~dark.png b/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~dark.png Binary files differnew file mode 100644 index 0000000000..10869d987c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~dark.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~dark@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..7b66df1d06 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~dark@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~dark~sel.png Binary files differnew file mode 100644 index 0000000000..64255347fd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~dark~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~dark~sel@2x.png Binary files differnew file mode 100644 index 0000000000..82a5afce0c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~dark~sel@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~sel.png Binary files differnew file mode 100644 index 0000000000..64255347fd --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~sel.png diff --git a/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~sel@2x.png Binary files differnew file mode 100644 index 0000000000..82a5afce0c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/prefs-metadata-16~sel@2x.png |
