Commit 5a95adf1 authored 9 years ago by v.tarantik

Merge branch 'feature-pursuit' into feature-pursuit_devel

Conflicts:
	core/src/cz/nic/tablexia/TablexiaSettings.java
	core/src/cz/nic/tablexia/game/games/pursuit/PursuitGame.java
	core/src/cz/nic/tablexia/util/ui/dialog/TablexiaDialog.java

parents 029b31b5 36e340e8

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 136 additions and 152 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment

Admin message

Merge branch 'feature-pursuit' into feature-pursuit_devel

Some changes are not shown.