[json-simple] 02/10: Merge tag 'upstream/1.1.1'

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository json-simple.

commit d1dfc68d6c46fec6e1c59bfec5992821632ba50f
Merge: 8ca3099 1c06bac
Author: Gilles Filippini <pini at debian.org>
Date:   Fri Sep 20 22:10:08 2013 +0200

    Merge tag 'upstream/1.1.1'
    
    Upstream version 1.1.1

 .classpath                                         |   16 ++---
 .project                                           |   34 +++++-----
 .settings/org.eclipse.core.resources.prefs         |    3 +
 AUTHORS.txt                                        |    3 +-
 ChangeLog.txt                                      |    4 ++
 VERSION.txt                                        |    2 +-
 build.xml                                          |   37 ++++++-----
 pom.xml                                            |   65 ++++++++++++++++++++
 src/{ => main/java}/org/json/simple/ItemList.java  |    0
 src/{ => main/java}/org/json/simple/JSONArray.java |    0
 src/{ => main/java}/org/json/simple/JSONAware.java |    0
 .../java}/org/json/simple/JSONObject.java          |   17 +++++
 .../java}/org/json/simple/JSONStreamAware.java     |    0
 src/{ => main/java}/org/json/simple/JSONValue.java |    0
 .../org/json/simple/parser/ContainerFactory.java   |    0
 .../org/json/simple/parser/ContentHandler.java     |    0
 .../java}/org/json/simple/parser/JSONParser.java   |    0
 .../org/json/simple/parser/ParseException.java     |    0
 .../java}/org/json/simple/parser/Yylex.java        |    0
 .../java}/org/json/simple/parser/Yytoken.java      |    0
 {test => src/test/java}/org/json/simple/Test.java  |    0
 .../java}/org/json/simple/parser/YylexTest.java    |    0
 22 files changed, 140 insertions(+), 41 deletions(-)

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