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

[Tim Lunn]

[Tim Lunn (darkxst)]

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

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-08 15:03:53 +0000
+++ debian/changelog	2014-04-12 22:53:20 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 ubiquity-slideshow-ubuntu (83) trusty; urgency=medium
 
   * Remove old Ubuntu One slides from edubuntu.
@@ -12,6 +13,18 @@
 
  -- Dimitri John Ledkov <[e-mail]>  Tue, 01 Apr 2014 18:49:28 +0100
 
+=======
+ubiquity-slideshow-ubuntu (82) trusty; urgency=medium
+
+  [Jackson Doak]
+  * Update screenshots for ubuntu-gnome
+ 
+  [Tim Lunn]
+  * Minor formatting fix for ubuntu-gnome media.html slide
+
+ -- Jackson Doak <[e-mail]>  Tue, 01 Apr 2014 08:04:24 +1100
+
+>>>>>>> MERGE-SOURCE
 ubiquity-slideshow-ubuntu (81) trusty; urgency=medium
 
   * Drop arkose from the Edubuntu slideshow, the package is broken and
 
=== modified file 'slideshows/ubuntu-gnome/slides/media.html'
--- slideshows/ubuntu-gnome/slides/media.html	2013-09-19 15:58:34 +0000
+++ slideshows/ubuntu-gnome/slides/media.html	2014-04-12 22:53:20 +0000
@@ -7,7 +7,8 @@
 <div class="main">
     <div class="text">
         <div>          
-            <p>Rhythmbox lets you organize your music and listen to Internet radio, podcasts, and more.</p> <br /> <br />
+            <p>Rhythmbox lets you organize your music and listen to Internet radio, podcasts, and more.</p> 
+            <br />
             <p>GNOME Videos allows you to easily watch videos from your computer, DVD, or streamed over the Internet.</p>
         </div>
 
 
=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/accessibility.png'
 Binary 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
=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/browse.png'
 Binary 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
=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/desktop.png'
 Binary 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
=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/gethelp.jpg'
 Binary 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
=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/goa.png'
 Binary 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
=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/media.png'
 Binary 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
=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/office.png'
 Binary 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
=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/photos.png'
 Binary 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
=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/usc.png'
 Binary 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
=== modified file 'slideshows/ubuntu-gnome/slides/screenshots/welcome.jpg'
 Binary 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