Ubiquity Slideshow

Merge lp:~darkxst/ubiquity-slideshow-ubuntu/ubuntu-gnome-14.04b into lp:ubiquity-slideshow-ubuntu

  1. ubuntu-gnome-14.04b
  2. Merge into html
Proposed by Tim Lunn
Status: Merged
Merged at revision: 642
Proposed branch: lp:~darkxst/ubiquity-slideshow-ubuntu/ubuntu-gnome-14.04b
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 62 lines (+15/-1) (has conflicts)
2 files modified
debian/changelog (+13/-0)
slideshows/ubuntu-gnome/slides/media.html (+2/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~darkxst/ubiquity-slideshow-ubuntu/ubuntu-gnome-14.04b
Reviewer Review Type Date Requested Status
Ubiquity Slideshow Pending
Review via email: mp+215560@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Lunn (darkxst) wrote :

I am struggling with limited internet currently and don't have the bandwidth to be able to rebase this branch, sorry!

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 2014-04-08 15:03:53 +0000
3+++ debian/changelog 2014-04-12 22:53:20 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 ubiquity-slideshow-ubuntu (83) trusty; urgency=medium
7
8 * Remove old Ubuntu One slides from edubuntu.
9@@ -12,6 +13,18 @@
10
11 -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 01 Apr 2014 18:49:28 +0100
12
13+=======
14+ubiquity-slideshow-ubuntu (82) trusty; urgency=medium
15+
16+ [Jackson Doak]
17+ * Update screenshots for ubuntu-gnome
18+
19+ [Tim Lunn]
20+ * Minor formatting fix for ubuntu-gnome media.html slide
21+
22+ -- Jackson Doak <noskcaj@ubuntu.com> Tue, 01 Apr 2014 08:04:24 +1100
23+
24+>>>>>>> MERGE-SOURCE
25 ubiquity-slideshow-ubuntu (81) trusty; urgency=medium
26
27 * Drop arkose from the Edubuntu slideshow, the package is broken and
28
29=== modified file 'slideshows/ubuntu-gnome/slides/media.html'
30--- slideshows/ubuntu-gnome/slides/media.html 2013-09-19 15:58:34 +0000
31+++ slideshows/ubuntu-gnome/slides/media.html 2014-04-12 22:53:20 +0000
32@@ -7,7 +7,8 @@
33 <div class="main">
34 <div class="text">
35 <div>
36- <p>Rhythmbox lets you organize your music and listen to Internet radio, podcasts, and more.</p> <br /> <br />
37+ <p>Rhythmbox lets you organize your music and listen to Internet radio, podcasts, and more.</p>
38+ <br />
39 <p>GNOME Videos allows you to easily watch videos from your computer, DVD, or streamed over the Internet.</p>
40 </div>
41
42
43=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/accessibility.png'
44Binary files slideshows/ubuntu-gnome/slides/screenshots/accessibility.png 2013-09-19 15:58:34 +0000 and slideshows/ubuntu-gnome/slides/screenshots/accessibility.png 2014-04-12 22:53:20 +0000 differ
45=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/browse.png'
46Binary files slideshows/ubuntu-gnome/slides/screenshots/browse.png 2013-09-13 02:47:51 +0000 and slideshows/ubuntu-gnome/slides/screenshots/browse.png 2014-04-12 22:53:20 +0000 differ
47=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/desktop.png'
48Binary files slideshows/ubuntu-gnome/slides/screenshots/desktop.png 2013-09-19 15:58:34 +0000 and slideshows/ubuntu-gnome/slides/screenshots/desktop.png 2014-04-12 22:53:20 +0000 differ
49=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/gethelp.jpg'
50Binary files slideshows/ubuntu-gnome/slides/screenshots/gethelp.jpg 2013-09-13 02:47:51 +0000 and slideshows/ubuntu-gnome/slides/screenshots/gethelp.jpg 2014-04-12 22:53:20 +0000 differ
51=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/goa.png'
52Binary files slideshows/ubuntu-gnome/slides/screenshots/goa.png 2013-09-13 02:47:51 +0000 and slideshows/ubuntu-gnome/slides/screenshots/goa.png 2014-04-12 22:53:20 +0000 differ
53=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/media.png'
54Binary files slideshows/ubuntu-gnome/slides/screenshots/media.png 2013-09-13 02:47:51 +0000 and slideshows/ubuntu-gnome/slides/screenshots/media.png 2014-04-12 22:53:20 +0000 differ
55=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/office.png'
56Binary files slideshows/ubuntu-gnome/slides/screenshots/office.png 2013-09-13 02:47:51 +0000 and slideshows/ubuntu-gnome/slides/screenshots/office.png 2014-04-12 22:53:20 +0000 differ
57=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/photos.png'
58Binary files slideshows/ubuntu-gnome/slides/screenshots/photos.png 2013-09-13 02:47:51 +0000 and slideshows/ubuntu-gnome/slides/screenshots/photos.png 2014-04-12 22:53:20 +0000 differ
59=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/usc.png'
60Binary files slideshows/ubuntu-gnome/slides/screenshots/usc.png 2013-09-13 02:47:51 +0000 and slideshows/ubuntu-gnome/slides/screenshots/usc.png 2014-04-12 22:53:20 +0000 differ
61=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/welcome.jpg'
62Binary files slideshows/ubuntu-gnome/slides/screenshots/welcome.jpg 2013-09-13 02:47:51 +0000 and slideshows/ubuntu-gnome/slides/screenshots/welcome.jpg 2014-04-12 22:53:20 +0000 differ

Subscribers

People subscribed via source and target branches