[Forensics-changes] [yara] 290/407: Merge branch 'master' of https://github.com/plusvic/yara 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 e880c59cf17b1ca2860c4562a354a489d4d768c2
Merge: befaa7c 65437b5
Author: Wesley Shields <wxs at atarininja.org>
Date:   Wed Dec 31 20:57:57 2014 -0500

    Merge branch 'master' of https://github.com/plusvic/yara into entropy_rename

 configure.ac                                    |    1 +
 libyara/Makefile.am                             |    4 +-
 libyara/arena.c                                 |    3 -
 libyara/exec.c                                  |  378 ++++----
 libyara/grammar.c                               | 1111 +++++++++--------------
 libyara/grammar.h                               |   42 +-
 libyara/grammar.y                               |  322 ++-----
 libyara/include/yara/arena.h                    |    1 +
 libyara/include/yara/exec.h                     |  178 ++--
 libyara/include/yara/lexer.h                    |    8 +-
 libyara/include/yara/parser.h                   |    7 +
 libyara/include/yara/sizedstr.h                 |   13 +-
 libyara/include/yara/strutils.h                 |    2 +-
 libyara/parser.c                                |  140 +++
 libyara/{include/yara/sizedstr.h => sizedstr.c} |   44 +-
 libyara/strutils.c                              |    2 +-
 yara-python/tests.py                            |   29 +-
 17 files changed, 1006 insertions(+), 1279 deletions(-)


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