Merge lp:~codygarver/elementaryos/move-pantheon-greeter-to-desktop into lp:~elementary-os/elementaryos/elementary-seeds.trusty

Proposed by Cody Garver
Status: Merged
Approved by: Cody Garver
Approved revision: 2206
Merged at revision: 2206
Proposed branch: lp:~codygarver/elementaryos/move-pantheon-greeter-to-desktop
Merge into: lp:~elementary-os/elementaryos/elementary-seeds.trusty
Diff against target: 23 lines (+1/-1)
2 files modified
desktop (+1/-0)
pantheon (+0/-1)
To merge this branch: bzr merge lp:~codygarver/elementaryos/move-pantheon-greeter-to-desktop
Reviewer Review Type Date Requested Status
Sergey "Shnatsel" Davidoff (community) Needs Information
Review via email: mp+221131@code.launchpad.net

Commit message

Move pantheon-greeter to desktop

To post a comment you must log in.
Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

Are you sure you linked the right bug? I can't see how these two are related, except if pantheon-greeter inexplicably pulls in that library.

review: Needs Information
Revision history for this message
Cody Garver (codygarver) wrote :

The attached bug used to describe this but it's been modified. Is this a good idea?

Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

Yeah, sounds good.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'desktop'
--- desktop 2014-05-27 13:08:27 +0000
+++ desktop 2014-05-27 18:06:54 +0000
@@ -49,6 +49,7 @@
4949
50 * elementary-artwork50 * elementary-artwork
51 * pantheon51 * pantheon
52 * (pantheon-greeter)
5253
53= System-wide distro-specific artwork =54= System-wide distro-specific artwork =
54 * (plymouth-theme-elementary-text)55 * (plymouth-theme-elementary-text)
5556
=== modified file 'pantheon'
--- pantheon 2014-01-28 02:50:29 +0000
+++ pantheon 2014-05-27 18:06:54 +0000
@@ -17,7 +17,6 @@
17 * (snap-photobooth)17 * (snap-photobooth)
1818
19# not exactly apps, but still part of the DE19# not exactly apps, but still part of the DE
20 * (pantheon-greeter)
21 * (pantheon-shell)20 * (pantheon-shell)
2221
23# contractor and very, very default contracts22# contractor and very, very default contracts

Subscribers

People subscribed via source and target branches