DropOff

Merge lp:~markellmtthw/dropoff/some-fixes into lp:~elementary-dev-community/dropoff/dropoff

  1. some-fixes
  2. Merge into dropoff
Proposed by Matthew Markell
Status: Approved
Approved by: Tom Beckmann
Approved revision: 8
Proposed branch: lp:~markellmtthw/dropoff/some-fixes
Merge into: lp:~elementary-dev-community/dropoff/dropoff
Diff against target: 28 lines (+4/-3)
2 files modified
data/dropoff.desktop (+3/-2)
src/Config.vala.cmake (+1/-1)
To merge this branch: bzr merge lp:~markellmtthw/dropoff/some-fixes
Reviewer Review Type Date Requested Status
Fabio Zaramella Approve
Review via email: mp+93045@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Fabio Zaramella (fabiozaramella) :
review: Approve
Reply

Unmerged revisions

8. By Matthew Markell

Some fixes, changed the .desktop to follow the HIG, updated copyright date.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/dropoff.desktop'
2--- data/dropoff.desktop 2012-02-12 22:26:23 +0000
3+++ data/dropoff.desktop 2012-02-14 18:23:30 +0000
4@@ -1,10 +1,11 @@
5 [Desktop Entry]
6 Type=Application
7 Name=Dropoff
8-Comment=Sharing done the simple way
9-GenericName=Sharing
10+Comment=Share your files
11+GenericName=File Sharer
12 Exec=dropoff %U
13 Icon=dropoff
14 Terminal=false
15 Categories=GNOME;GTK;Utility;
16 MimeType=application/*;audio/*;example/*;image/*;message/*;model/*;multipart/*;text/*;video/*;
17+
18
19=== modified file 'src/Config.vala.cmake'
20--- src/Config.vala.cmake 2012-02-12 21:25:24 +0000
21+++ src/Config.vala.cmake 2012-02-14 18:23:30 +0000
22@@ -1,5 +1,5 @@
23 //
24-// Copyright (C) 2011 Tom Beckmann
25+// Copyright (C) 2012 Tom Beckmann
26 //
27 // This program is free software: you can redistribute it and/or modify
28 // it under the terms of the GNU General Public License as published by

Subscribers

People subscribed via source and target branches