Merge lp://staging/~karni/ubuntuone-android-files/cleanup-good-boy into lp://staging/ubuntuone-android-files
Proposed by
Michał Karnicki
| Status: | Merged |
|---|---|
| Approved by: | Chad Miller |
| Approved revision: | 174 |
| Merged at revision: | 174 |
| Proposed branch: | lp://staging/~karni/ubuntuone-android-files/cleanup-good-boy |
| Merge into: | lp://staging/ubuntuone-android-files |
| Diff against target: |
125 lines (+14/-28) 8 files modified
.bzrignore (+2/-0) .classpath (+1/-1) .project (+0/-16) build.properties (+0/-1) build.xml (+1/-1) default.properties (+0/-2) setup.sh (+2/-2) src/com/ubuntuone/android/files/service/MetaService.java (+8/-5) |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-files/cleanup-good-boy |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
[FIX] Don't hit the servers when picture taken, if we're not uploading anything. [reported by Lucio]
[CLEANUP] Ignore Eclipse's .project and Ant's default.properties.
1) Eclipse: include necessary Android libraries by hand
2) Ant: just customize paths at top of setup.sh and run it
To post a comment you must log in.
Revision history for this message
| Chad Miller (cmiller) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
