diff options
| author | David Karlaš <david.karlas@xamarin.com> | 2014-07-21 10:39:55 +0400 |
|---|---|---|
| committer | David Karlaš <david.karlas@xamarin.com> | 2014-07-21 10:39:55 +0400 |
| commit | a9c5ced1eeaaa6a01d09db905b805ab14de7087a (patch) | |
| tree | 3a9e29d30afbf9f3f315324c0a0407b8df2e8bf8 /main/src/core/MonoDevelop.Ide/icons | |
| parent | ca83e07efe022fc1fc1da016d51b4b77d79c8925 (diff) | |
| parent | 331c8233ca7784f2537bd0fffdf30f0b21957123 (diff) | |
Merge branch 'master' into debuggerVisualizers
Conflicts:
main/external/debugger-libs
main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/icons')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/light/catchpoint-16.png | bin | 0 -> 878 bytes |
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/light/catchpoint-16@2x.png | bin | 0 -> 2015 bytes |
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/light/catchpoint-disabled-16.png | bin | 0 -> 741 bytes |
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/icons/light/catchpoint-disabled-16@2x.png | bin | 0 -> 1677 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/main/src/core/MonoDevelop.Ide/icons/light/catchpoint-16.png b/main/src/core/MonoDevelop.Ide/icons/light/catchpoint-16.png Binary files differnew file mode 100644 index 0000000000..bc9ee4a041 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/light/catchpoint-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/light/catchpoint-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/light/catchpoint-16@2x.png Binary files differnew file mode 100644 index 0000000000..cb1c8a2e3d --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/light/catchpoint-16@2x.png diff --git a/main/src/core/MonoDevelop.Ide/icons/light/catchpoint-disabled-16.png b/main/src/core/MonoDevelop.Ide/icons/light/catchpoint-disabled-16.png Binary files differnew file mode 100644 index 0000000000..d22183af90 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/light/catchpoint-disabled-16.png diff --git a/main/src/core/MonoDevelop.Ide/icons/light/catchpoint-disabled-16@2x.png b/main/src/core/MonoDevelop.Ide/icons/light/catchpoint-disabled-16@2x.png Binary files differnew file mode 100644 index 0000000000..a5f671e0e7 --- /dev/null +++ b/main/src/core/MonoDevelop.Ide/icons/light/catchpoint-disabled-16@2x.png |
