/android/import-contacts

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/edam/importcontacts/Merge.java

  • Committer: edam
  • Date: 2011-05-05 21:49:43 UTC
  • Revision ID: edam@waxworlds.org-20110505214943-bg0cn6qz0gr49dlk
- updated TODO
- made varibale names consistent (camelCaseVariables now_use_underscores)

Show diffs side-by-side

added added

removed removed

30
30
public class Merge extends WizardActivity
31
31
{
32
32
        @Override
33
 
        protected void onCreate( Bundle savedInstanceState )
 
33
        protected void onCreate( Bundle saved_instance_state )
34
34
        {
35
35
                setContentView( R.layout.merge );
36
 
                super.onCreate( savedInstanceState );
 
36
                super.onCreate( saved_instance_state );
37
37
 
38
38
                setNextActivity( Doit.class );
39
39
        }