[Forensics-changes] [yara] 107/368: Merge remote-tracking branch 'core/master'

[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 a4ec68880a4f0c92b119825c6c9029bd65e26f1f
Merge: 8427c03 2fac34b
Author: Mario Suvajac <msuvajac at gmail.com>
Date:   Mon Nov 2 12:38:55 2015 +0100

    Merge remote-tracking branch 'core/master'

 README.md                  |  1 +
 libyara/include/yara/elf.h | 10 +++++++---
 libyara/include/yara/pe.h  |  2 +-
 libyara/modules/elf.c      | 14 +++++++++-----
 libyara/modules/pe.c       | 34 +++++++++++++++++++---------------
 5 files changed, 37 insertions(+), 24 deletions(-)

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