[r-cran-rjson] 02/05: Merge tag 'upstream/0.2.14'

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository r-cran-rjson.

commit ccd27d805c0e4235f326bf4fb78df3d3ac1096a8
Merge: f32bc3f 670bef2
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Jun 13 10:57:26 2014 +0200

    Merge tag 'upstream/0.2.14'
    
    Upstream version 0.2.14

 DESCRIPTION                      |   6 +-
 MD5                              |  19 +++--
 NAMESPACE                        |   0
 R/json.R                         |   0
 R/zzz.R                          |   0
 build/vignette.rds               | Bin 0 -> 210 bytes
 inst/changelog.txt               |   5 +-
 inst/doc/json_rpc_server.Rnw     |   0
 inst/doc/json_rpc_server.pdf     | Bin 65494 -> 65138 bytes
 inst/rpc_server/server.r         | 176 +++++++++++++++++++--------------------
 inst/rpc_server/some_script.r    |  22 ++---
 inst/rpc_server/start_server     |  16 ++--
 inst/rpc_server/start_server.bat |  14 ++--
 inst/unittests/runtests.r        |   0
 inst/unittests/test.array.r      |   0
 inst/unittests/test.big.r        |   0
 inst/unittests/test.factors.r    |   0
 inst/unittests/test.list.r       |   6 ++
 inst/unittests/test.number.r     |   0
 inst/unittests/test.strings.r    |   0
 inst/unittests/test.tojson.r     |   0
 inst/unittests/test.twitter.r    |   0
 inst/unittests/test.unicode.r    |   0
 man/fromJSON.Rd                  |   0
 man/newJSONParser.Rd             |   0
 man/rjson.Rd                     |   0
 man/toJSON.Rd                    |   0
 src/dump.cpp                     |   0
 src/parser.c                     |  12 ++-
 vignettes/json_rpc_server.Rnw    |   0
 30 files changed, 146 insertions(+), 130 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-rjson.git