[Forensics-changes] [yara] 54/368: Merge branch 'master' into imports_dll

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.5.0
in repository yara.

commit cef852759e36bf8e7c652fcc5a179a358959314f
Merge: a0134ea cb5f612
Author: Wesley Shields <wxs at atarininja.org>
Date:   Thu Sep 17 09:44:02 2015 -0400

    Merge branch 'master' into imports_dll

 libyara/arena.c                 |    6 +-
 libyara/atoms.c                 |    2 +-
 libyara/exec.c                  |   28 +-
 libyara/filemap.c               |    4 +-
 libyara/grammar.c               |  360 +++-----
 libyara/grammar.y               |  126 +--
 libyara/hash.c                  |    4 +-
 libyara/hex_grammar.c           |   14 +-
 libyara/hex_grammar.h           |    2 +-
 libyara/hex_grammar.y           |   14 +-
 libyara/include/yara/arena.h    |    6 +-
 libyara/include/yara/mem.h      |    4 +-
 libyara/include/yara/parser.h   |    4 +-
 libyara/include/yara/sizedstr.h |    4 +-
 libyara/include/yara/strutils.h |    6 +-
 libyara/include/yara/types.h    |   10 +-
 libyara/mem.c                   |    8 +-
 libyara/modules.c               |    3 -
 libyara/modules/hash.c          |   18 +-
 libyara/modules/pe.c            |    4 +-
 libyara/object.c                |    4 +-
 libyara/parser.c                |    8 +-
 libyara/re.c                    |    2 +-
 libyara/scan.c                  |   35 +-
 libyara/sizedstr.c              |    2 +-
 libyara/strutils.c              |   10 +-
 yara-python/MANIFEST            |    3 -
 yara-python/README              |    9 -
 yara-python/setup.py            |   40 -
 yara-python/setupwin32.py       |   29 -
 yara-python/setupwin64.py       |   29 -
 yara-python/tests.py            |  902 -------------------
 yara-python/yara-python.c       | 1900 ---------------------------------------
 yara.c                          |    3 +-
 34 files changed, 279 insertions(+), 3324 deletions(-)


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