[Forensics-changes] [yara] 55/407: Merge branch 'master' into richpe

[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 3c95ecab9758ffb1af04d2bf7d1f4e06585aeae6
Merge: 6df98c0 5ade2bf
Author: Wesley Shields <wxs at atarininja.org>
Date:   Tue Sep 23 22:23:30 2014 -0400

    Merge branch 'master' into richpe

 Makefile.am          |   2 +-
 configure.ac         |   4 +-
 libyara/modules/pe.c |   2 +-
 libyara/object.c     |   3 +-
 libyara/proc.c       |   2 -
 m4/acx_pthread.m4    | 364 +++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 370 insertions(+), 7 deletions(-)


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