elementary OS

Merge lp:~codygarver/elementaryos/fix-1291748-seeds into lp:~elementary-os/elementaryos/elementary-seeds.trusty

  1. fix-1291748-seeds
  2. Merge into elementary-seeds.trusty
Proposed by Cody Garver
Status: Merged
Merged at revision: 2209
Proposed branch: lp:~codygarver/elementaryos/fix-1291748-seeds
Merge into: lp:~elementary-os/elementaryos/elementary-seeds.trusty
Diff against target: 12 lines (+2/-1)
1 file modified
live (+2/-1)
To merge this branch: bzr merge lp:~codygarver/elementaryos/fix-1291748-seeds
Reviewer Review Type Date Requested Status
elementary OS team Pending
Review via email: mp+217163@code.launchpad.net

Commit message

Add elementary-live-settings to live

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

Uhm, why are we using light-locker again?

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

Wait. Wrong merge. Derp!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'live'
2--- live 2013-11-14 22:22:51 +0000
3+++ live 2014-04-25 01:26:42 +0000
4@@ -26,7 +26,8 @@
5 * language-pack-gnome-${Languages} [i386 powerpc]
6
7 * gparted
8- * cifs-utils # Needed by casper for CIFS root=
9+ * cifs-utils # Needed by casper for CIFS root
10+ * elementary-live-settings # disables light-locker
11
12 == Ubiquity components ==
13

Subscribers

People subscribed via source and target branches