38e345aff1
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
16 lines
352 B
Plaintext
16 lines
352 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
|
|
src
|