Merge branch 'devel' into feature-pursuit
Showing
- android/assets/text/screen/encyclopedia/encyclopedia_cs.properties 43 additions, 43 deletions...ssets/text/screen/encyclopedia/encyclopedia_cs.properties
- android/assets/text/screen/encyclopedia/encyclopedia_de.properties 1 addition, 1 deletion...ssets/text/screen/encyclopedia/encyclopedia_de.properties
- android/assets/text/screen/encyclopedia/encyclopedia_sk.properties 1 addition, 1 deletion...ssets/text/screen/encyclopedia/encyclopedia_sk.properties
- core/assets/common/screen/encyclopedia/gfx/bookmark.9.png 0 additions, 0 deletionscore/assets/common/screen/encyclopedia/gfx/bookmark.9.png
- core/assets/common/screen/encyclopedia/gfx/bookmark.png 0 additions, 0 deletionscore/assets/common/screen/encyclopedia/gfx/bookmark.png
- core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java 39 additions, 57 deletions.../nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java
- core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Content.java 11 additions, 2 deletions...c/tablexia/screen/encyclopedia/content/model/Content.java
- core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Header.java 16 additions, 7 deletions...ic/tablexia/screen/encyclopedia/content/model/Header.java
- core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Hint.java 12 additions, 1 deletion.../nic/tablexia/screen/encyclopedia/content/model/Hint.java
- core/src/cz/nic/tablexia/screen/encyclopedia/content/model/ImageContent.java 17 additions, 1 deletion...lexia/screen/encyclopedia/content/model/ImageContent.java
- core/src/cz/nic/tablexia/screen/encyclopedia/content/model/TextContent.java 1 addition, 1 deletion...blexia/screen/encyclopedia/content/model/TextContent.java
- core/src/cz/nic/tablexia/screen/encyclopedia/menu/MenuWidget.java 7 additions, 3 deletions.../cz/nic/tablexia/screen/encyclopedia/menu/MenuWidget.java
Please register or sign in to comment