From 8a87769af809d8e3c8e43805d47e12569bc4a9d0 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Sun, 15 Mar 2015 02:14:02 +0100 Subject: Fix : static analyzer test on Travis --- .travis.yml | 1 + README.md | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ebda15..5e4f3aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ compiler: gcc script: make test-travis before_install: - sudo apt-get update -qq + - sudo apt-get install -qq clang - sudo apt-get install -qq g++-multilib - sudo apt-get install -qq gcc-multilib - sudo apt-get install -qq valgrind diff --git a/README.md b/README.md index 7ab64cc..d6e9933 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,11 @@ A high compression derivative, called LZ4_HC, is also provided. It trades CPU ti |master | [![Build Status](https://travis-ci.org/Cyan4973/lz4.svg?branch=master)](https://travis-ci.org/Cyan4973/lz4) | |dev | [![Build Status](https://travis-ci.org/Cyan4973/lz4.svg?branch=dev)](https://travis-ci.org/Cyan4973/lz4) | -This is an official mirror of LZ4 project, [hosted on Google Code](http://code.google.com/p/lz4/). -The intention is to offer github's capabilities to lz4 users, such as cloning, branch, pull requests or source download. +This is the official LZ4 repository. The "master" branch will reflect, the status of lz4 at its official homepage. -The "dev" branch is the one where all contributions will be merged. If you plan to propose a patch, please commit into the "dev" branch. Direct commit to "master" are not permitted. -Feature branches will also exist, typically to introduce new requirements, and be temporarily available for testing before merge into "dev" branch. +The "dev" branch is the one where all contributions must be merged before being promoted to master. If you plan to propose a patch, please commit into the "dev" branch. Direct commit to "master" are not permitted. +Feature branches also exist, temporarily, typically to introduce some new requirements and functions, and for dedicated testing before merge into "dev" branch. Benchmarks -- cgit v0.12