Nueva BRanch


Change-Id: I7d634d2965052658366ee211af7a1f8fcf7b5fb1
Realidad Aumentada
Merge branch 'dev' of https://github.com/Esteam85/Actividades-Lugares into dev

Conflicts:
	.classpath
	bin/R.txt

bin/classes/com/econtreras/ModuloActividades/ActividadArrayAdapter.class
	bin/classes/com/econtreras/ModuloActividades/ActividadDialog.class
	bin/classes/com/econtreras/ModuloActividades/Actividades.class
	bin/classes/com/econtreras/ModuloActividades/CrearActividad.class

bin/classes/com/econtreras/ModuloActividades/ListFragmentInscritas.class
	bin/classes/com/econtreras/ModuloActividades/ListFragmentMes.class
	bin/classes/com/econtreras/ModuloActividades/ListFragmentTodas.class

bin/classes/com/econtreras/ModuloLugaresDeInteres/ListFragmentCercanos.c
lass

bin/classes/com/econtreras/ModuloLugaresDeInteres/ListFragmentTodos.clas
s

bin/classes/com/econtreras/ModuloLugaresDeInteres/LugaresArrayAdapter.cl
ass

bin/classes/com/econtreras/ModuloLugaresDeInteres/LugaresDeInteres.class

bin/classes/com/econtreras/ModuloLugaresDeInteres/LugaresDeInteresDialog
.class
	bin/classes/com/example/tesis/R$array.class
	bin/classes/com/example/tesis/R$bool.class
	bin/classes/com/example/tesis/R$color.class
	bin/classes/com/example/tesis/R$dimen.class
	bin/classes/com/example/tesis/R$drawable.class
	bin/classes/com/example/tesis/R$id.class
	bin/classes/com/example/tesis/R$integer.class
	bin/classes/com/example/tesis/R$layout.class
	bin/classes/com/example/tesis/R$menu.class
	bin/classes/com/example/tesis/R$string.class
	bin/classes/com/example/tesis/R$style.class
	bin/classes/com/example/tesis/R$styleable.class
	bin/classes/com/example/tesis/R.class
	gen/com/example/tesis/R.java