Merge branch 'git.jackcraft/storageonly'
This commit is contained in:
8
.gitignore
vendored
8
.gitignore
vendored
@@ -2,7 +2,6 @@
|
|||||||
*CMakeFiles/*
|
*CMakeFiles/*
|
||||||
*CMakeCache*
|
*CMakeCache*
|
||||||
cmake_install.cmake
|
cmake_install.cmake
|
||||||
test.sh
|
|
||||||
*~
|
*~
|
||||||
gitwork
|
gitwork
|
||||||
work
|
work
|
||||||
@@ -18,9 +17,8 @@ compile
|
|||||||
todo
|
todo
|
||||||
vsc*
|
vsc*
|
||||||
libcompound.so
|
libcompound.so
|
||||||
ccwarn
|
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
CMakeLists_default.txt
|
CMakeLists_default.txt
|
||||||
>>>>>>> 010300157e252e47218c74f256bca0ea12b7baa3
|
CompoundTest
|
||||||
|
ccwarn
|
||||||
genwarn.sh
|
genwarn.sh
|
||||||
|
test.sh
|
||||||
|
Reference in New Issue
Block a user