[Forensics-changes] [yara] 169/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 7f310781c08a2d2c574833dcfb9ce5f7e0673bab
Merge: b5a4229 b86a6f6
Author: Wesley Shields <wxs at atarininja.org>
Date:   Thu Oct 30 12:32:15 2014 -0400

    Merge branch 'master' into authenticode

 libyara/hex_grammar.c            | 48 ++++++++++++++++++++++++++--------------
 libyara/hex_grammar.y            | 16 ++++++++++++++
 libyara/hex_lexer.c              |  1 +
 libyara/hex_lexer.l              |  1 +
 libyara/include/yara/hex_lexer.h |  1 +
 libyara/include/yara/limits.h    |  1 +
 6 files changed, 52 insertions(+), 16 deletions(-)

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