Ubiquity Slideshow

Merge lp:~viking.redwolf/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu into lp:ubiquity-slideshow-ubuntu

  1. ubiquity-slideshow-ubuntu
  2. Merge into html
Proposed by Redwolf on 2017-09-08
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2017-10-06
Approved revision: 794
Merged at revision: 801
Proposed branch: lp:~viking.redwolf/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 41 lines (+4/-4)
2 files modified
slideshows/lubuntu/slides/02_browser.html (+2/-2)
slideshows/lubuntu/slides/04_media.html (+2/-2)
To merge this branch: bzr merge lp:~viking.redwolf/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve on 2017-10-06
Simon Quigley (community) 2017-10-06 Approve on 2017-10-06
Redwolf (community) Approve on 2017-10-06
Dylan McCall 2017-09-13 Pending
Review via email: mp+330404@code.launchpad.net

Description of the Change

Added Lubuntu 17.10 updated apps and slideshows

To post a comment you must log in.
Redwolf (viking.redwolf) :
review: Approve
Simon Quigley (tsimonq2) wrote :

LGTM

review: Approve
Mathieu Trudel-Lapierre (cyphermox) wrote :

Approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'slideshows/lubuntu/slides/02_browser.html'
2--- slideshows/lubuntu/slides/02_browser.html 2015-04-01 00:01:34 +0000
3+++ slideshows/lubuntu/slides/02_browser.html 2017-09-08 10:15:21 +0000
4@@ -19,8 +19,8 @@
5 <h2 class="subtitle">Supported software</h2>
6 <ul>
7 <li>
8- <img class="icon" src="icons/flash.png" />
9- <p class="caption">Flash</p>
10+ <img class="icon" src="icons/qupzilla.png" />
11+ <p class="caption">Qupzilla</p>
12 </li>
13
14 <li>
15
16=== modified file 'slideshows/lubuntu/slides/04_media.html'
17--- slideshows/lubuntu/slides/04_media.html 2015-04-01 00:01:34 +0000
18+++ slideshows/lubuntu/slides/04_media.html 2017-09-08 10:15:21 +0000
19@@ -7,7 +7,7 @@
20
21
22 <div>
23- <p>Listen to your favorite music with <em>Audacious</em>, a simple but powerful audio player. And enjoy all your videos with <em>Gnome-Mplayer</em>, a fast video player powered by mplayer with support for many formats.</p>
24+ <p>Listen to your favorite music with <em>Audacious</em>, a simple but powerful audio player. And enjoy all your videos with <em>Gnome MPV</em>, the next generation video player, with support for many formats.</p>
25 </div>
26
27 <div>
28@@ -25,7 +25,7 @@
29
30 <li>
31 <img class="icon" src="icons/gnome-mplayer.png" />
32- <p class="caption">Gnome-Mplayer</p>
33+ <p class="caption">Gnome MPV</p>
34 </li>
35
36 </ul>
37
38=== added file 'slideshows/lubuntu/slides/icons/qupzilla.png'
39Binary files slideshows/lubuntu/slides/icons/qupzilla.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/icons/qupzilla.png 2017-09-08 10:15:21 +0000 differ
40=== modified file 'slideshows/lubuntu/slides/screenshots/04_media.png'
41Binary files slideshows/lubuntu/slides/screenshots/04_media.png 2017-03-26 13:32:53 +0000 and slideshows/lubuntu/slides/screenshots/04_media.png 2017-09-08 10:15:21 +0000 differ

Subscribers

People subscribed via source and target branches