[Forensics-changes] [yara] 124/407: Merge branch 'master' into authenticode

[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 a89b293b3470cc2a535ac63f946911849b2b2e62
Merge: 7e3156f 1c0968d
Author: Wesley Shields <wxs at atarininja.org>
Date:   Thu Oct 16 11:41:09 2014 -0400

    Merge branch 'master' into authenticode

 libyara/include/yara/mem.h |    4 +
 libyara/mem.c              |   32 +-
 libyara/modules/pe.c       | 1142 ++++++++++++++++++++++----------------------
 3 files changed, 599 insertions(+), 579 deletions(-)


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