Dale Visser 1e29d2e751 Merge branch 'upmaster' into ruby-bundler ...

Conflicts:
	dependency-check-cli/src/main/java/org/owasp/dependencycheck/CliParser.java

2015-08-30 15:11:33 -04:00

..

assembly

updated so that *.sh files are marked as executable

2015-08-02 07:24:36 -04:00

java/org/owasp/dependencycheck

Merge branch 'upmaster' into ruby-bundler

2015-08-30 15:11:33 -04:00

resources

added logback instead of JUL to resolve issue #164

2015-06-21 06:18:54 -04:00