diff options
author | Przemyslaw Skibinski <inikep@gmail.com> | 2016-12-27 09:43:07 (GMT) |
---|---|---|
committer | Przemyslaw Skibinski <inikep@gmail.com> | 2016-12-27 09:43:07 (GMT) |
commit | efaa9b7bc72a037bddee530b8dcaefa53c9c999d (patch) | |
tree | 2ae32cac8cd397e2d3604d8172d18c61761496fa /contrib/cmake_unofficial/.gitignore | |
parent | b22e2bed5e44f2cdacb11cf01d4a15a00bcb76ca (diff) | |
parent | 19c0f21b000ababf11cb38e0d6154742f5e1cd83 (diff) | |
download | lz4-efaa9b7bc72a037bddee530b8dcaefa53c9c999d.zip lz4-efaa9b7bc72a037bddee530b8dcaefa53c9c999d.tar.gz lz4-efaa9b7bc72a037bddee530b8dcaefa53c9c999d.tar.bz2 |
Merge remote-tracking branch 'refs/remotes/lz4/dev' into dev
# Conflicts:
# lib/Makefile
Diffstat (limited to 'contrib/cmake_unofficial/.gitignore')
-rw-r--r-- | contrib/cmake_unofficial/.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/cmake_unofficial/.gitignore b/contrib/cmake_unofficial/.gitignore index 0f81929..d39505d 100644 --- a/contrib/cmake_unofficial/.gitignore +++ b/contrib/cmake_unofficial/.gitignore @@ -5,3 +5,5 @@ CMakeFiles *.cmake Makefile liblz4.pc +lz4c +install_manifest.txt |