Skip to content
Snippets Groups Projects
Commit 218c0c75 authored by Drahomír's avatar Drahomír
Browse files

Merge branch 'devel' into feature-gamemenu

Conflicts:
	core/src/cz/nic/tablexia/util/ScaleUtil.java
parents 9721430e d1299134
No related branches found
No related tags found
No related merge requests found
Showing
with 87 additions and 13 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 to comment