Merge lp:~sladen/unity-asset-pool/unity-asset-pool-icons-lp745555 into lp:unity-asset-pool

[Paul Sladen]

Glad the extra rename meta-data was useful rather than a delete/create :)

Resubmitting per-IRC since that's what's available.

Didrocks: I should note that in the massive-asset-dump there were 62 icons with no hint as to which ones actually needed replacing. If (in your opinion) the change between before and after is indistinguishable/imperceivable then there's a the opinion not to ship it on the basis that no "diff" of the priority changes was provided with the dump.

[Didier Roche-Tolomelli (didrocks)]

renamed file 'unity-icon-theme/places/svg/group-mostused.svg' => 'unity-icon-theme/places/22/group-mostused.png'

All that will make a lot of changes in the places, change which should be coordinated and such.

Please, repropose a merge for the other contents (launcher/tile_arrow.png, panel/divider.png, unity-icon-theme/apps/48/workspace-switcher.png and unity-icon-theme/places/48/user-trash*) without those changes

review: Disapprove

[lp:~sladen/unity-asset-pool/unity-asset-pool-icons-lp745555]

51. By Paul Sladen on 2011-04-12

revert -r49 unity-icon-theme/places/svg/group-*.svg per IRC

[Paul Sladen (sladen)]

review: Disapprove

[Paul Sladen (sladen)]

bzr revert -r49 unity-icon-theme/places/svg/group-*.svg per IRC

review: Needs Resubmitting

[Didier Roche-Tolomelli (didrocks)]

ok, launchpad is laggy to refresh the merge, taking the branch, all looks good now :) thanks Paul!

review: Approve

=== modified file 'launcher/tile_arrow.png'
 Binary files launcher/tile_arrow.png	2010-08-16 11:51:34 +0000 and launcher/tile_arrow.png	2011-04-12 11:43:34 +0000 differ
=== modified file 'panel/divider.png'
 Binary files panel/divider.png	2010-09-13 14:53:28 +0000 and panel/divider.png	2011-04-12 11:43:34 +0000 differ
=== added directory 'unity-icon-theme/apps/48'
=== added file 'unity-icon-theme/apps/48/workspace-switcher.png'
 Binary files unity-icon-theme/apps/48/workspace-switcher.png	1970-01-01 00:00:00 +0000 and unity-icon-theme/apps/48/workspace-switcher.png	2011-04-12 11:43:34 +0000 differ
=== modified file 'unity-icon-theme/index.theme'
--- unity-icon-theme/index.theme	2010-08-31 13:32:29 +0000
+++ unity-icon-theme/index.theme	2011-04-12 11:43:34 +0000
@@ -6,7 +6,12 @@
 Example=directory-x-normal
 
 #Directory list
-Directories=apps/128,places/22,search/16,web/48
+Directories=apps/48,apps/128,places/22,places/48,places/svg,search/16,web/48
+
+[apps/48]
+Size=48
+Context=Apps
+Type=Fixed
 
 [apps/128]
 Size=128
@@ -23,6 +28,11 @@
 Context=Places
 Type=Scalable
 
+[places/48]
+Size=48
+Context=Places
+Type=Fixed
+
 [search/16]
 Size=16
 Context=Search
 
=== added directory 'unity-icon-theme/places/48'
=== added file 'unity-icon-theme/places/48/user-trash-full.png'
 Binary files unity-icon-theme/places/48/user-trash-full.png	1970-01-01 00:00:00 +0000 and unity-icon-theme/places/48/user-trash-full.png	2011-04-12 11:43:34 +0000 differ
=== added file 'unity-icon-theme/places/48/user-trash.png'
 Binary files unity-icon-theme/places/48/user-trash.png	1970-01-01 00:00:00 +0000 and unity-icon-theme/places/48/user-trash.png	2011-04-12 11:43:34 +0000 differ