SWADroid/.gitignore
Helena Rodriguez 6d86cf18b6 Merge branch 'develop' of https://hrguez@github.com/Amab/SWADroid.git
into develop

Conflicts:
	SWADroid/gen/es/ugr/swad/swadroid/R.java
2012-05-21 12:59:14 +02:00

15 lines
315 B
Plaintext

SWADroid/bin/
SWADroid/default.properties
SWADroid/.classpath
SWADroid/.project
SWADroid/.settings/
capturas/
iconos/
gitstats/
SWADroidTest/
SWADroid/.DS_Store
SWADroid/gen/es/ugr/swad/swadroid/BuildConfig.java
SWADroid/gen/es/ugr/swad/swadroid/R.java
SWADroid/gen/com/google/zxing/client/android/R.java
.DS_Store