Ubuntu One Client

Merge lp:~dobey/ubuntuone-client/marshaller-dist into lp:ubuntuone-client

  1. marshaller-dist
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: Guillermo Gonzalez
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~dobey/ubuntuone-client/marshaller-dist
Merge into: lp:ubuntuone-client
Diff against target: 12 lines (+3/-0)
1 file modified
nautilus/Makefile.am (+3/-0)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/marshaller-dist
Reviewer Review Type Date Requested Status
Guillermo Gonzalez Approve
Rick McBride (community) Approve
Review via email: mp+16541@code.launchpad.net

Commit message

Add the marshaller list file to EXTRA_DIST

To post a comment you must log in.
Revision history for this message
Rick McBride (rmcbride) wrote :

this will work.

review: Approve
Revision history for this message
Guillermo Gonzalez (verterok) wrote :

yessir, it works!

Revision history for this message
Guillermo Gonzalez (verterok) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nautilus/Makefile.am'
2--- nautilus/Makefile.am 2009-12-17 19:12:38 +0000
3+++ nautilus/Makefile.am 2009-12-23 15:27:14 +0000
4@@ -27,5 +27,8 @@
5 $(DBUS_LIBS) \
6 $(NAUTILUS_LIBS)
7
8+EXTRA_DIST = \
9+ ubuntuone-marshallers.list
10+
11 MAINTAINERCLEANFILES = \
12 Makefile.in

Subscribers

People subscribed via source and target branches