[Forensics-changes] [yara] 321/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 100405e407e162f4a19f3186cd038dbd039310c1
Merge: a8d6eea 9d1c14a
Author: Wesley Shields <wxs at atarininja.org>
Date:   Mon Jan 5 10:34:23 2015 -0500

    Merge branch 'master' into issue_231

 libyara/Makefile.am            |   2 +-
 libyara/exec.c                 | 117 ++++-----
 libyara/include/yara/modules.h |  13 +
 libyara/include/yara/utils.h   |   4 +-
 libyara/lexer.c                | 389 ++++++++++++++--------------
 libyara/lexer.l                |   6 +-
 libyara/modules/entropy.c      | 180 -------------
 libyara/modules/math.c         | 559 +++++++++++++++++++++++++++++++++++++++++
 libyara/modules/module_list    |   2 +-
 libyara/object.c               |   4 +
 yara-python/tests.py           |   6 +-
 yara-python/yara-python.c      |   4 +-
 12 files changed, 829 insertions(+), 457 deletions(-)

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