SWADroid/.gitignore at 5631e62e277ea9718f9f1a5ff0c7c24a3af7e05c - SWADroid - Gitea

Marown/SWADroid

Helena Rodriguez 38e345aff1 Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.gitignore
	SWADroid/AndroidManifest.xml
	SWADroid/project.properties
	SWADroid/res/layout/list_items.xml
	SWADroid/res/values-es/strings.xml
	SWADroid/res/values/strings.xml
	SWADroid/res/xml/tables.xml
	SWADroid/src/es/ugr/swad/swadroid/Global.java
	SWADroid/src/es/ugr/swad/swadroid/SWADMain.java
	SWADroid/src/es/ugr/swad/swadroid/model/Course.java
	SWADroid/src/es/ugr/swad/swadroid/model/DataBaseHelper.java
	SWADroid/src/es/ugr/swad/swadroid/model/Group.java
	SWADroid/src/es/ugr/swad/swadroid/modules/Groups.java
	SWADroid/src/es/ugr/swad/swadroid/modules/attendance/Attendance.java

2012-10-02 20:26:36 +02:00

16 lines

352 B

Plaintext

Raw Blame History

 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
 src