diff options
| author | raveit65 <[email protected]> | 2013-10-23 12:04:15 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2013-10-23 12:04:15 +0200 |
| commit | 48f9063d6247d8ac4feeae64784bfb1030691b31 (patch) | |
| tree | 812dd9c11008774e1caee4d4595640850cd9efee /menta/index.theme | |
| parent | 24f70a17b3e6438b835caadedae7a6c0eed83da7 (diff) | |
| parent | 3d368610cef04faed66b9da837c7613589ec76b2 (diff) | |
| download | mate-icon-theme-48f9063d6247d8ac4feeae64784bfb1030691b31.tar.bz2 mate-icon-theme-48f9063d6247d8ac4feeae64784bfb1030691b31.tar.xz | |
fix merge conflict
Diffstat (limited to 'menta/index.theme')
| -rw-r--r-- | menta/index.theme | 65 |
1 files changed, 1 insertions, 64 deletions
diff --git a/menta/index.theme b/menta/index.theme index a63f28a..c1ca8b2 100644 --- a/menta/index.theme +++ b/menta/index.theme @@ -21,7 +21,7 @@ PanelDefault=32 PanelSizes=16,22,32,48,64,72,96,128 # Directory list -Directories=16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/places,16x16/status,22x22/actions,22x22/apps,22x22/categories,22x22/devices,22x22/places,22x22/status,24x24/actions,24x24/apps,24x24/categories,24x24/devices,24x24/places,24x24/status,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/places,32x32/status,48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/status,256x256/actions,256x256/apps,256x256/categories,256x256/devices,256x256/places,256x256/status,scalable/actions,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/mimetypes,scalable/places,scalable/status +Directories=16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/places,16x16/status,22x22/actions,22x22/apps,22x22/categories,22x22/devices,22x22/places,22x22/status,24x24/actions,24x24/apps,24x24/categories,24x24/devices,24x24/places,24x24/status,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/places,32x32/status,48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/status,256x256/actions,256x256/apps,256x256/categories,256x256/devices,256x256/places,256x256/status [16x16/actions] Context=Actions @@ -215,66 +215,3 @@ MinSize=56 MaxSize=512 Type=Scalable -[scalable/actions] -Context=Actions -Size=16 -MinSize=8 -MaxSize=512 -Type=Scalable - -[scalable/apps] -Context=Applications -Size=16 -MinSize=8 -MaxSize=512 -Type=Scalable - -[scalable/categories] -Context=Applications -Size=16 -MinSize=8 -MaxSize=512 -Type=Scalable - -[scalable/devices] -Context=Devices -Size=16 -MinSize=8 -MaxSize=512 -Type=Scalable - -[scalable/emblems] -Context=Emblems -Size=16 -MinSize=8 -MaxSize=512 -Type=Scalable - -[scalable/emotes] -Context=Emotes -Size=16 -MinSize=8 -MaxSize=512 -Type=Scalable - -[scalable/mimetypes] -Context=Mimetypes -Size=16 -MinSize=8 -MaxSize=512 -Type=Scalable - -[scalable/places] -Context=Places -Size=16 -MinSize=8 -MaxSize=512 -Type=Scalable - -[scalable/status] -Context=Status -Size=16 -MinSize=8 -MaxSize=512 -Type=Scalable - |