[Forensics-changes] [yara] 259/407: Merge branch 'master' into resource_name_and_entropy

[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 a51eaf2d84c825788cb96409915c8253d7b0c8a3
Merge: dd4f0cc a7b6dfe
Author: Wesley Shields <wxs at atarininja.org>
Date:   Tue Dec 23 14:49:51 2014 -0500

    Merge branch 'master' into resource_name_and_entropy

 docs/gettingstarted.rst |   2 +-
 libyara/modules/elf.c   | 176 +++++++++++++++++++++++++-----------------------
 libyara/modules/pe.c    |   4 +-
 3 files changed, 95 insertions(+), 87 deletions(-)


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