diff options
| author | Andrea Cimitan <andrea.cimitan@canonical.com> | 2012-02-13 22:43:18 +0000 |
|---|---|---|
| committer | Andrea Cimitan <andrea.cimitan@canonical.com> | 2012-02-13 22:43:18 +0000 |
| commit | ade6482163454b574991e67e7bca82f5f425e9bf (patch) | |
| tree | 1ad458440209c5ed62c5f61d38d7185b4db870dc /plugins/unityshell/resources | |
| parent | 01ae251cf21e40a4dfae41dbd7a86fe04ba39710 (diff) | |
| parent | da8c96d1dc728ef4935ace4bf4a238ba92eb9d2d (diff) | |
Merge trunk and fix conflict
(bzr r1945.1.3)
Diffstat (limited to 'plugins/unityshell/resources')
| -rw-r--r-- | plugins/unityshell/resources/close_dash_disabled.png | bin | 0 -> 1292 bytes |
| -rw-r--r-- | plugins/unityshell/resources/maximize_dash_disabled.png | bin | 0 -> 1208 bytes |
| -rw-r--r-- | plugins/unityshell/resources/minimize_dash_disabled.png | bin | 0 -> 1191 bytes |
| -rw-r--r-- | plugins/unityshell/resources/unmaximize_dash_disabled.png | bin | 0 -> 1208 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/plugins/unityshell/resources/close_dash_disabled.png b/plugins/unityshell/resources/close_dash_disabled.png Binary files differnew file mode 100644 index 000000000..3925bda11 --- /dev/null +++ b/plugins/unityshell/resources/close_dash_disabled.png diff --git a/plugins/unityshell/resources/maximize_dash_disabled.png b/plugins/unityshell/resources/maximize_dash_disabled.png Binary files differnew file mode 100644 index 000000000..06eaf9b0b --- /dev/null +++ b/plugins/unityshell/resources/maximize_dash_disabled.png diff --git a/plugins/unityshell/resources/minimize_dash_disabled.png b/plugins/unityshell/resources/minimize_dash_disabled.png Binary files differnew file mode 100644 index 000000000..05352beca --- /dev/null +++ b/plugins/unityshell/resources/minimize_dash_disabled.png diff --git a/plugins/unityshell/resources/unmaximize_dash_disabled.png b/plugins/unityshell/resources/unmaximize_dash_disabled.png Binary files differnew file mode 100644 index 000000000..06eaf9b0b --- /dev/null +++ b/plugins/unityshell/resources/unmaximize_dash_disabled.png |