[esorex] 02/04: Merge branch 'upstream' into debian

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository esorex.

commit ecb99340d39b65759c9519fb20b760275f6c7397
Merge: 15f8ca0 758666b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Apr 12 13:13:20 2014 +0200

    Merge branch 'upstream' into debian

 Makefile.purify.in           |   2 +-
 config.h.in                  |   3 +
 configure                    |  31 ++-
 configure.ac                 |   5 +-
 m4/eso.m4                    |  11 +
 src/er_fileutils.c           |   8 +-
 src/er_fileutils.h           |   8 +-
 src/er_help.c                |  13 +-
 src/er_help.h                |   8 +-
 src/er_json.c                |   6 +-
 src/er_json.h                |   6 +-
 src/er_main.c                | 637 ++++++++++++++++++++++++++-----------------
 src/er_main.h                |  25 +-
 src/er_paf.c                 |  38 +--
 src/er_paf.h                 |   8 +-
 src/er_params.c              |  47 +---
 src/er_params.h              |   8 +-
 src/er_paramutils.c          |   8 +-
 src/er_paramutils.h          |   8 +-
 src/er_plugin.c              |  49 +---
 src/er_plugin.h              |   9 +-
 src/er_pluginlist.c          |   8 +-
 src/er_pluginlist.h          |   8 +-
 src/er_stringarray.c         |   8 +-
 src/er_stringarray.h         |   8 +-
 src/er_stringutils.c         |   8 +-
 src/er_stringutils.h         |   8 +-
 src/tests/esorex_json-test.c |   6 +-
 28 files changed, 532 insertions(+), 460 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/esorex.git