[proguard] 02/03: Merge tag 'upstream/5.3.1'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository proguard.

commit dbe089e6f287e4b99f43c4545e5d98570f84145f
Merge: 80131c1 be98cfe
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Oct 29 23:54:24 2016 +0200

    Merge tag 'upstream/5.3.1'
    
    Upstream version 5.3.1

 buildscripts/maven/ant/pom.xml               |  2 +-
 buildscripts/maven/base/pom.xml              |  2 +-
 buildscripts/maven/gradle/pom.xml            |  2 +-
 buildscripts/maven/gui/pom.xml               |  2 +-
 buildscripts/maven/pom.xml                   |  2 +-
 buildscripts/maven/retrace/pom.xml           |  2 +-
 buildscripts/maven/wtk/pom.xml               |  2 +-
 src/proguard/ProGuard.java                   |  2 +-
 src/proguard/gui/GUIResources.properties     |  2 +-
 src/proguard/retrace/ReTrace.java            |  2 +-
 src/proguard/util/AndMatcher.java            |  8 ++++----
 src/proguard/util/ConstantMatcher.java       |  4 ++--
 src/proguard/util/EmptyStringMatcher.java    |  6 +++---
 src/proguard/util/ExtensionMatcher.java      | 11 +++++------
 src/proguard/util/FixedStringMatcher.java    | 12 ++++++++----
 src/proguard/util/ListMatcher.java           |  6 +++---
 src/proguard/util/NotMatcher.java            |  6 +++---
 src/proguard/util/OrMatcher.java             |  8 ++++----
 src/proguard/util/SettableMatcher.java       |  6 +++---
 src/proguard/util/StringMatcher.java         | 21 +++++++++++++++++----
 src/proguard/util/VariableStringMatcher.java | 16 ++++++++--------
 21 files changed, 70 insertions(+), 54 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/proguard.git