Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge de random splash #6

Open
wants to merge 35 commits into
base: kudo
Choose a base branch
from
Open

merge de random splash #6

wants to merge 35 commits into from

Conversation

JavierLight
Copy link
Contributor

No description provided.

JavierLight and others added 3 commits November 10, 2014 21:07
merge de eliminar eventos.xml
Fragment_Grupos modo pro integración en light
Añadidas imágenes de cabecera para dichos layouts.
Reducido el tiempo de SplashScreen. Ahora es random
@JavierLight JavierLight reopened this Nov 11, 2014
JavierLight and others added 24 commits November 11, 2014 16:31
Añadidas las imágenes necesarias para dichos layouts.
Merge a falta de juego, Quiénes somos y Acerca de
SplashScreen compatible con dispositivos con poca memoria
Solo falta el juego.
Tratando de implementar ventana de ganador.
…bix2014

Conflicts:
	app/src/main/java/com/ieeesbumh/expoaltabix2014/juego.java
	app/src/main/res/layout/win.xml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants