[Forensics-changes] [yara] 221/368: Merge remote-tracking branch 'upstream/master' into sectionreader

[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 0d58eb2740bed843f8feddb919b8529697daa8c6
Merge: fcb1a45 8d00ae8
Author: Kyle Reed <kallanreed at outlook.com>
Date:   Sat Mar 5 18:42:15 2016 -0800

    Merge remote-tracking branch 'upstream/master' into sectionreader

 .gitignore                     |   10 +-
 Makefile.am                    |    4 +-
 README.md                      |    1 +
 docs/commandline.rst           |    5 +
 docs/yarapython.rst            |   24 +-
 libyara/exec.c                 |    8 +-
 libyara/grammar.c              |  799 +++++++++++++-------------
 libyara/grammar.y              |   13 +
 libyara/include/yara/libyara.h |   14 +
 libyara/libyara.c              |   42 ++
 tests/blob.h                   |  167 ++++++
 tests/test-alignment.c         |   16 +-
 tests/test-rules.c             | 1246 ++++++++++++++++++++++++++++++++++++++++
 tests/util.c                   |  174 ++++++
 tests/util.h                   |  111 ++++
 yara.c                         |   10 +
 16 files changed, 2240 insertions(+), 404 deletions(-)

diff --cc .gitignore
index 7b08c2a,1e4309e..c014b28
--- a/.gitignore
+++ b/.gitignore
@@@ -49,17 -49,10 +49,25 @@@ stamp-h
  # Linux and Mac files
  *.swp
  .DS_Store
 +
+ test-alignment
+ test-alignment.log
+ test-alignment.trs
+ test-rules
+ test-rules.log
+ test-rules.trs
+ test-suite.log
++
 +# Visual Studio files
 +Release/
 +Debug/
 +x64/
 +*.obj
 +*.suo
 +*.sdf
 +*.opendb
 +*.opensdf
 +*.user
 +
 +# NuGet
- windows/*/packages/
++windows/*/packages/

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