Merge branch 'for_android_beta_96' into android_branch (and up version strings)

Conflicts:
	xwords4/android/XWords4/assets/changes.html
This commit is contained in:
Eric House 2015-04-07 21:08:00 -07:00
commit e7dc14a4e7
3 changed files with 3 additions and 3 deletions

View file

@ -22,7 +22,7 @@
to come from a domain that you own or have control over. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.eehouse.android.xw4"
android:versionCode="88"
android:versionCode="90"
android:versionName="@string/app_version"
>

View file

@ -13,7 +13,7 @@
</style>
</head>
<body>
<h2>Crosswords 4.4 beta 96 release</h2>
<h2>Crosswords 4.4 beta 97 release</h2>
<p>This release changes how networked games are started and
communicate.</p>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_version">4.4 beta 95</string>
<string name="app_version">4.4 beta 97</string>
</resources>