Merge branch 'pluginhosttest'

Conflicts:
	.gitignore
This commit is contained in:
Philipp Crocoll
2014-05-16 17:17:43 +02:00
483 changed files with 27953 additions and 7162 deletions

View File

@@ -37,7 +37,8 @@ namespace ArtTestApp
FindViewById<Button>(Resource.Id.MyButton2).Click += (sender, args) => StartActivityForResult(typeof(Activity2),1);
FindViewById<Button>(Resource.Id.MyButton3).Click += (sender, args) => StartActivityForResult(typeof(PrefActivity), 1);
StartActivity(typeof(Activity2));
Finish();
}
}