← Back to branch summary

~tomdroid-maintainers/tomdroid/note-editing-and-syncing

~tomdroid-maintainers/tomdroid/note-editing-and-syncing

Viewing all changes in revision 338.

Committer: noahy
Date: 2012-08-05 23:43:28 UTC
Revision ID: noahy57@gmail.com-20120805234328-94zwgibjuq0g1b3n

added diff activity on conflicts

files added:
libs/diffutils-1.2.1.jar

res/layout/note_compare.xml

src/org/tomdroid/ui/SyncDialog.java

files removed:
src/org/tomdroid/SyncDialog.java

files modified:
.classpath

AndroidManifest.xml

res/layout/note_edit.xml

res/layout/note_view.xml

res/values/strings.xml

src/org/tomdroid/Note.java

src/org/tomdroid/NoteManager.java

src/org/tomdroid/sync/web/SnowySyncService.java

src/org/tomdroid/ui/SyncMessageHandler.java

src/org/tomdroid/ui/Tomdroid.java

src/org/tomdroid/util/LinkifyPhone.java

Show diffs side-by-side

added added

removed removed

AndroidManifest.xml

libs/diffutils-1.2.1.jar

res/layout/note_compare.xml

res/layout/note_edit.xml

res/layout/note_view.xml

res/values/strings.xml

src/org/tomdroid/Note.java

src/org/tomdroid/NoteManager.java

src/org/tomdroid/SyncDialog.java

src/org/tomdroid/sync/web/SnowySyncService.java

src/org/tomdroid/ui/SyncDialog.java

src/org/tomdroid/ui/SyncMessageHandler.java

src/org/tomdroid/ui/Tomdroid.java

src/org/tomdroid/util/LinkifyPhone.java

Older »