David A. Velasco 63a3522ab7 Merge branch 'develop'after SPRINT-002 ... Conflicts: .classpath		2013-06-19 17:56:46 +02:00
..
attrs.xml	initial commit of editbox with badge	2012-05-01 23:37:37 +02:00
bools.xml	REFACTORING: fix layout problems in orientation changes after removing FileDetailActivity	2013-06-04 14:30:29 +02:00
colors.xml	Copyright note fixes	2013-04-17 12:26:13 +02:00
oauth2_configuration.xml	Generic values for Oauth 2 configuration	2013-05-03 13:30:35 +02:00
strings.xml	Merge branch 'develop'after SPRINT-002	2013-06-19 17:56:46 +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