[Forensics-changes] [yara] 331/407: Merge branch 'master' into issue_231

[Hilko Bengen]

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

bengen pushed a commit to annotated tag v3.3.0
in repository yara.

commit c1cf3dfba932bd7aec4b33c4d6c3d122db60d7e5
Merge: 35f0961 f1fe727
Author: Wesley Shields <wxs at atarininja.org>
Date:   Thu Jan 8 20:43:54 2015 -0500

    Merge branch 'master' into issue_231

 libyara/Makefile.am            | 11 ++++++
 libyara/exec.c                 |  2 +-
 libyara/grammar.c              | 26 +++++++-------
 libyara/grammar.y              | 26 +++++++-------
 libyara/include/yara/lexer.h   |  2 +-
 libyara/include/yara/modules.h | 37 ++++++++-----------
 libyara/include/yara/object.h  |  4 +--
 libyara/modules/math.c         | 80 +++++++++++++++++++++---------------------
 libyara/modules/tests.c        | 30 ++++++++++------
 libyara/object.c               | 18 +++++-----
 libyara/parser.c               |  8 ++---
 libyara/yara.pc.in             | 11 ++++++
 yara-python/tests.py           |  9 +++--
 13 files changed, 145 insertions(+), 119 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git