[Forensics-changes] [yara] 306/407: Merge branch 'master' into entropy_rename

[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 e6ff7e5af4dc1c1f4a96442e36f8c8d56f3a1003
Merge: a563875 f2f206c
Author: Wesley Shields <wxs at atarininja.org>
Date:   Sat Jan 3 20:59:51 2015 -0500

    Merge branch 'master' into entropy_rename

 configure.ac                   |   1 +
 libyara/exec.c                 | 576 ++++++++++++++++++++++++-----------------
 libyara/include/yara/modules.h |  47 +++-
 libyara/include/yara/object.h  |   5 +
 libyara/modules/hash.c         |  30 +--
 libyara/modules/pe.c           |  96 ++++---
 libyara/modules/tests.c        |  14 +-
 libyara/object.c               |  39 ++-
 8 files changed, 487 insertions(+), 321 deletions(-)


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