Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AndroidOnlabKviz2018
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

b5d7970f

Commit b5d7970f authored 7 years ago by KGreg

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/ClientGameActivity' into ClientGameActivity

parents b8d0fb61 9991f998

No related branches found

No related tags found

Loading

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

KvizServer/app/src/main/assets/defaultQuestions.txt 3 additions, 0 deletions

KvizServer/app/src/main/assets/defaultQuestions.txt
KvizServer/app/src/main/assets/tippek.txt 7 additions, 0 deletions

KvizServer/app/src/main/assets/tippek.txt
KvizServer/app/src/main/java/onlab/kvizserver/GameActivity.java 6 additions, 2 deletions

...rver/app/src/main/java/onlab/kvizserver/GameActivity.java
KvizServer/app/src/main/java/onlab/kvizserver/LobbyActivity.java 1 addition, 1 deletion

...ver/app/src/main/java/onlab/kvizserver/LobbyActivity.java
KvizServer/app/src/main/java/onlab/kvizserver/MainActivity.java 2 additions, 0 deletions

...rver/app/src/main/java/onlab/kvizserver/MainActivity.java
KvizServer/app/src/main/res/layout/activity_main.xml 27 additions, 6 deletions

KvizServer/app/src/main/res/layout/activity_main.xml

with 46 additions and 9 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Hosted with by KSZK