David A. Velasco 9b4da8439a Merge branch 'develop' into oauth_login ... Conflicts: res/layout-land/account_setup.xml res/layout/account_setup.xml		2013-05-03 10:24:20 +02:00
..
attrs.xml	initial commit of editbox with badge	2012-05-01 23:37:37 +02:00
bools.xml	Copyright note fixes	2013-04-17 12:26:13 +02:00
colors.xml	Copyright note fixes	2013-04-17 12:26:13 +02:00
oauth2_configuration.xml	Make the OAuth authorization available or not depending upon a variable in oauth.xml	2013-03-27 13:39:00 +01:00
strings.xml	Merge branch 'develop' into oauth_login	2013-05-03 10:24:20 +02:00
styles.xml	Merge branch 'develop' into oauth_login	2013-04-25 19:39:22 +02:00
urls.xml	Copyright note fixes	2013-04-17 12:26:13 +02:00