example-content

Merge lp:~jorge/example-content/fcs-lucid into lp:~ubuntu-core-dev/example-content/ubuntu

  1. fcs-lucid
  2. Merge into ubuntu
Proposed by Jorge Castro
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jorge/example-content/fcs-lucid
Merge into: lp:~ubuntu-core-dev/example-content/ubuntu
Diff against target: 24 lines (+7/-0)
1 file modified
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~jorge/example-content/fcs-lucid
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+22088@code.launchpad.net

Description of the change

Changes for Lucid.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'Ubuntu_Free_Culture_Showcase/FrustrationBlues-ColinRoss.ogg'
2Binary files Ubuntu_Free_Culture_Showcase/FrustrationBlues-ColinRoss.ogg 1970-01-01 00:00:00 +0000 and Ubuntu_Free_Culture_Showcase/FrustrationBlues-ColinRoss.ogg 2010-03-24 23:15:29 +0000 differ
3=== removed file 'Ubuntu_Free_Culture_Showcase/InTheCircle.oga'
4Binary files Ubuntu_Free_Culture_Showcase/InTheCircle.oga 2009-09-29 10:48:02 +0000 and Ubuntu_Free_Culture_Showcase/InTheCircle.oga 1970-01-01 00:00:00 +0000 differ
5=== added file 'Ubuntu_Free_Culture_Showcase/UbuntuIsHumanity.ogv'
6Binary files Ubuntu_Free_Culture_Showcase/UbuntuIsHumanity.ogv 1970-01-01 00:00:00 +0000 and Ubuntu_Free_Culture_Showcase/UbuntuIsHumanity.ogv 2010-03-24 23:15:29 +0000 differ
7=== removed file 'Ubuntu_Free_Culture_Showcase/build_to_heaven.jpg'
8Binary files Ubuntu_Free_Culture_Showcase/build_to_heaven.jpg 2009-09-24 15:31:44 +0000 and Ubuntu_Free_Culture_Showcase/build_to_heaven.jpg 1970-01-01 00:00:00 +0000 differ
9=== removed file 'Ubuntu_Free_Culture_Showcase/water-and-wind.ogv'
10Binary files Ubuntu_Free_Culture_Showcase/water-and-wind.ogv 2009-09-24 13:55:35 +0000 and Ubuntu_Free_Culture_Showcase/water-and-wind.ogv 1970-01-01 00:00:00 +0000 differ
11=== modified file 'debian/changelog'
12--- debian/changelog 2010-02-22 18:04:07 +0000
13+++ debian/changelog 2010-03-24 23:15:29 +0000
14@@ -1,3 +1,10 @@
15+example-content (UNRELEASED) lucid; urgency=low
16+
17+ * Add new FCS winners.
18+ * Add licensing metadata, thanks Greg Grossmeier
19+
20+ -- Jorge O. Castro <jorge@ubuntu.com> Wed, 24 Mar 2010 19:07:56 -0400
21+
22 example-content (40) lucid; urgency=low
23
24 * Set Icon=folder in .desktop file (thanks, Luca Ferretti; LP: #458250).

Subscribers

People subscribed via source and target branches

to all changes: