[jenkins-json] 01/04: Merge tag 'upstream/2.4-jenkins-3'
James Downing Page
jamespage at moszumanska.debian.org
Sun Dec 22 21:05:48 UTC 2013
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch master
in repository jenkins-json.
commit 6d1bcfabee28b3524aa892288af3c7dbb2a8d2d9
Merge: d692dc1 967b9e4
Author: James Page <james.page at ubuntu.com>
Date: Sun Dec 22 20:37:26 2013 +0000
Merge tag 'upstream/2.4-jenkins-3'
Upstream version 2.4-jenkins-3
pom.xml | 2 +-
src/main/java/net/sf/json/JSONNull.java | 2 +-
src/main/jdk15/net/sf/json/JSONArray.java | 6 +--
src/main/jdk15/net/sf/json/JSONObject.java | 20 ++++++++--
src/test/java/net/sf/json/MaheshDeSilvaTest.java | 50 ++++++++++++++++++++++++
src/test/java/net/sf/json/TestUserSubmitted.java | 4 +-
6 files changed, 71 insertions(+), 13 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-json.git
More information about the pkg-java-commits
mailing list