[Forensics-changes] [yara] 134/160: Merge pull request #309 from nyx0/master

[Hilko Bengen]

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

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

commit a13e78022260476f38504b166bebb5136a3b2211
Merge: 85456ae 5215859
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Wed May 27 11:13:28 2015 +0200

    Merge pull request #309 from nyx0/master
    
    Fix the ARM architecture value

 .gitignore                 |  4 ++++
 docs/modules/elf.rst       |  7 +++++--
 libyara/include/yara/elf.h | 26 +++++++++++++++-----------
 libyara/modules/elf.c      | 14 +++++++++++---
 4 files changed, 35 insertions(+), 16 deletions(-)

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