/android/import-contacts : revision 27

To get this branch, use:

bzr branch
http://bzr.ed.am/android/import-contacts

« back to all changes in this revision

Viewing changes to src/org/waxworlds/importcontacts/MergePrompt.java

Committer: edam
Date: 2010-12-14 16:00:39 UTC
Revision ID: edam@waxworlds.org-20101214160039-u37uvpw7wn3tmo3d

Tags: 1.1

- bump version to 1.1

files added:
COPYING

NEWS

default.properties

gen/org

gen/org/waxworlds

gen/org/waxworlds/edam

gen/org/waxworlds/edam/importcontacts

res/drawable/browse.png

res/drawable/directory.png

res/drawable/sdcard.png

res/layout/filechooser.xml

res/layout/filechooser_row.xml

res/layout/fileordir.xml

res/layout/intro.xml

src/org/waxworlds/edam

src/org/waxworlds/edam/importcontacts/FileChooser.java

src/org/waxworlds/edam/importcontacts/Intro.java

files removed:
src/org/waxworlds/importcontacts/ImportContacts.java

src/org/waxworlds/importcontacts/MergePrompt.java

files renamed:
src/org/waxworlds/importcontacts/R.java => gen/org/waxworlds/edam/importcontacts/R.java

res/layout/import_vcf.xml => res/layout/configure_vcf.xml

src/org/waxworlds/importcontacts/ => src/org/waxworlds/edam/importcontacts/

src/org/waxworlds/importcontacts/ImportVCF.java => src/org/waxworlds/edam/importcontacts/ConfigureVCF.java

files modified:
.classpath

.project

AndroidManifest.xml

TODO

res/layout/doit.xml

res/layout/merge.xml

res/layout/mergeprompt.xml

res/values/strings.xml

src/org/waxworlds/edam/importcontacts/Doit.java

src/org/waxworlds/edam/importcontacts/Importer.java

src/org/waxworlds/edam/importcontacts/Merge.java

src/org/waxworlds/edam/importcontacts/VCFImporter.java

src/org/waxworlds/edam/importcontacts/WizardActivity.java

Show diffs side-by-side

added added

removed removed

src/org/waxworlds/importcontacts/MergePrompt.java

package org.waxworlds.importcontacts;

import android.app.Activity;

public class MergePrompt extends Activity {

}