Merge lp:~indicator-applet-developers/indicator-appmenu/ubuntu into lp:~ubuntu-desktop/indicator-appmenu/ubuntu

Proposed by Ted Gould on 2010-09-27
Status: Merged
Merged at revision: 41
Proposed branch: lp:~indicator-applet-developers/indicator-appmenu/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-appmenu/ubuntu
Diff against target: 27 lines (+9/-0)
2 files modified
debian/changelog (+7/-0)
src/indicator-appmenu.c (+2/-0)
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-appmenu/ubuntu
Reviewer Review Type Date Requested Status
Didier Roche 2010-09-27 Pending
Review via email: mp+36757@code.launchpad.net

Description of the Change

Eclipse in blacklist

To post a comment you must log in.

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 2010-09-23 19:03:04 +0000
3+++ debian/changelog 2010-09-27 17:07:19 +0000
4@@ -1,3 +1,10 @@
5+indicator-appmenu (0.0.13-0ubuntu2~ppa1) maverick; urgency=low
6+
7+ * Upstream Merge
8+ * Add Eclipse to the blacklist (LP: #633828)
9+
10+ -- Ted Gould <ted@ubuntu.com> Mon, 27 Sep 2010 12:04:29 -0500
11+
12 indicator-appmenu (0.0.13-0ubuntu1) maverick; urgency=low
13
14 * New upstream release.
15
16=== modified file 'src/indicator-appmenu.c'
17--- src/indicator-appmenu.c 2010-09-23 17:43:05 +0000
18+++ src/indicator-appmenu.c 2010-09-27 17:07:19 +0000
19@@ -654,6 +654,8 @@
20 /* Blender */
21 "/usr/share/applications/blender-fullscreen.desktop",
22 "/usr/share/applications/blender-windowed.desktop",
23+ /* Eclipse */
24+ "/usr/share/applications/eclipse.desktop",
25
26 NULL
27 };

Subscribers

People subscribed via source and target branches

to all changes: