SWADroid/.gitignore
Helena Rodriguez ef6cdcb596 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	SWADroid/src/es/ugr/swad/swadroid/model/DataBaseHelper.java
2012-10-13 14:34:43 +02:00

16 lines
349 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
gen/com/google/zxing/client/android/R.java