diff options
| author | David Karlaš <david.karlas@xamarin.com> | 2014-08-26 00:19:22 +0400 |
|---|---|---|
| committer | David Karlaš <david.karlas@xamarin.com> | 2014-08-26 00:19:22 +0400 |
| commit | efe5c0519566e778a5bec4de72a741dd713840a7 (patch) | |
| tree | a240324b97127cfe438c73c130cce614193366ad /main/src/core/MonoDevelop.Ide/icons | |
| parent | e703a57058098e8e5dc732b5b09f34ac69f0b68c (diff) | |
| parent | b515603c137bb37d916f64c603150c93a8ebab40 (diff) | |
Merge branch 'master' into debuggerVisualizers
Conflicts:
main/external/debugger-libs
main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/icons')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/light/project-status-error-16.png | bin | 0 -> 430 bytes |
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/light/project-status-error-16@2x.png | bin | 0 -> 763 bytes |
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/light/project-status-information-16.png | bin | 0 -> 368 bytes |
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/light/project-status-information-16@2x.png | bin | 0 -> 672 bytes |
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/light/project-status-warning-16.png | bin | 0 -> 290 bytes |
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/light/project-status-warning-16@2x.png | bin | 0 -> 508 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/main/src/core/MonoDevelop.Ide/icons/light/project-status-error-16.png b/main/src/core/MonoDevelop.Ide/icons/light/project-status-error-16.png Binary files differnew file mode 100644 index 0000000000..303b0b6234 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/light/project-status-error-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/light/project-status-error-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/light/project-status-error-16@2x.png Binary files differnew file mode 100644 index 0000000000..a64809d01d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/light/project-status-error-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/light/project-status-information-16.png b/main/src/core/MonoDevelop.Ide/icons/light/project-status-information-16.png Binary files differnew file mode 100644 index 0000000000..9a1ed0325c --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/light/project-status-information-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/light/project-status-information-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/light/project-status-information-16@2x.png Binary files differnew file mode 100644 index 0000000000..4418693d5b --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/light/project-status-information-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/light/project-status-warning-16.png b/main/src/core/MonoDevelop.Ide/icons/light/project-status-warning-16.png Binary files differnew file mode 100644 index 0000000000..0844d58e39 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/light/project-status-warning-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/light/project-status-warning-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/light/project-status-warning-16@2x.png Binary files differnew file mode 100644 index 0000000000..54a99a5bc2 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/light/project-status-warning-16@2x.png |
