diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-05-24 12:01:36 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-05-24 12:01:36 +0200 |
| commit | 872d4ed448ff8cb4ba894cde0abeab0c432c661c (patch) | |
| tree | aab7f3b847fd5a32fea51f7f3024b6ec2884d8eb | |
| parent | 0ac84dd0d2cb8a4f7c6988be9fcafb1dd74a35a2 (diff) | |
| parent | e9a1541d3cb497666e809158d80edcffbef86189 (diff) | |
| download | cgeo-872d4ed448ff8cb4ba894cde0abeab0c432c661c.zip cgeo-872d4ed448ff8cb4ba894cde0abeab0c432c661c.tar.gz cgeo-872d4ed448ff8cb4ba894cde0abeab0c432c661c.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values/strings.xml
| -rw-r--r-- | main/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCConstants.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml index e016ff3..0c6d922 100644 --- a/main/AndroidManifest.xml +++ b/main/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - android:versionName="09.05.2012" - android:versionCode="20120509" + android:versionName="24.05.2012" + android:versionCode="20120524" package="cgeo.geocaching" name="c:geo" android:installLocation="auto"> diff --git a/main/src/cgeo/geocaching/connector/gc/GCConstants.java b/main/src/cgeo/geocaching/connector/gc/GCConstants.java index cdd011f..6f1e065 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCConstants.java +++ b/main/src/cgeo/geocaching/connector/gc/GCConstants.java @@ -24,7 +24,7 @@ public final class GCConstants { * Patterns for parsing the result of a (detailed) search */ public final static Pattern PATTERN_HINT = Pattern.compile("<div id=\"div_hint\"[^>]*>(.*?)</div>"); - public final static Pattern PATTERN_DESC = Pattern.compile("<span id=\"ctl00_ContentBody_LongDescription\"><div class=\"UserSuppliedContent\">(.*?)</div>\\s*<p>\\s*</p>\\s*<p id=\"ctl00_ContentBody_hints\">"); + public final static Pattern PATTERN_DESC = Pattern.compile("<span id=\"ctl00_ContentBody_LongDescription\">(.*?)</span>\\s*</div>\\s*<p>\\s*</p>\\s*<p id=\"ctl00_ContentBody_hints\">"); public final static Pattern PATTERN_SHORTDESC = Pattern.compile("<span id=\"ctl00_ContentBody_ShortDescription\">(.*?)</span>\\s*</div>"); public final static Pattern PATTERN_GEOCODE = Pattern.compile("class=\"CoordInfoCode\">(GC[0-9A-Z]+)</span>"); public final static Pattern PATTERN_CACHEID = Pattern.compile("/seek/log\\.aspx\\?ID=(\\d+)"); |