ubuntukylin-default-settings

Merge lp:~cjwatson/ubuntukylin-default-settings/remove-skype-icons into lp:~ubuntukylin-members/ubuntukylin-default-settings/trunk

  1. remove-skype-icons
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Approved by: Jack Yu
Approved revision: 45
Merge reported by: Jack Yu
Merged at revision: not available
Proposed branch: lp:~cjwatson/ubuntukylin-default-settings/remove-skype-icons
Merge into: lp:~ubuntukylin-members/ubuntukylin-default-settings/trunk
Diff against target: 20 lines (+6/-0)
1 file modified
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~cjwatson/ubuntukylin-default-settings/remove-skype-icons
Reviewer Review Type Date Requested Status
Jack Yu Approve
Review via email: mp+160688@code.launchpad.net

Description of the change

ubuntukylin-default-settings ships Skype icons, which we've been instructed not to ship (bug 1163504). They weren't used, so please remove them. I've uploaded this as ubuntukylin-default-settings 1.0.4.1 for an urgent respin.

To post a comment you must log in.
Revision history for this message
Jack Yu (jackyu) :
review: Approve
Revision history for this message
Jack Yu (jackyu) wrote :

cjwatson, merged.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-04-16 13:08:16 +0000
3+++ debian/changelog 2013-04-24 15:35:29 +0000
4@@ -1,3 +1,9 @@
5+ubuntukylin-default-settings (1.0.4.1) raring; urgency=low
6+
7+ * Remove Skype icons (LP: #1163504).
8+
9+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 24 Apr 2013 16:24:57 +0100
10+
11 ubuntukylin-default-settings (1.0.4) raring; urgency=low
12
13 * refresh dependency and minor fixes. (LP: #1165636, #1165298, #1168215)
14
15=== removed file 'ubiquity-slideshow/slides/en_US/icons/skype.png'
16Binary files ubiquity-slideshow/slides/en_US/icons/skype.png 2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/en_US/icons/skype.png 1970-01-01 00:00:00 +0000 differ
17=== removed file 'ubiquity-slideshow/slides/zh_CN/icons/skype.png'
18Binary files ubiquity-slideshow/slides/zh_CN/icons/skype.png 2013-03-13 11:50:59 +0000 and ubiquity-slideshow/slides/zh_CN/icons/skype.png 1970-01-01 00:00:00 +0000 differ
19=== removed file 'ubiquity-slideshow/slides/zh_TW/icons/skype.png'
20Binary files ubiquity-slideshow/slides/zh_TW/icons/skype.png 2013-03-26 09:15:44 +0000 and ubiquity-slideshow/slides/zh_TW/icons/skype.png 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches