diff options
author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2013-03-15 08:53:48 +0100 |
---|---|---|
committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2013-03-15 08:53:48 +0100 |
commit | d4f1fc90188820a00a74a7e5fd04f6feffa7537e (patch) | |
tree | 8de40811f49ed755004d0c104edfad8123b45623 /.gitignore | |
parent | 8f1b7c6d44bb5e5f44b497e3260364407a98361e (diff) | |
parent | 73246448ec8294d781bb7f223fce395d49bfb6e4 (diff) | |
download | uca-d4f1fc90188820a00a74a7e5fd04f6feffa7537e.tar.gz uca-d4f1fc90188820a00a74a7e5fd04f6feffa7537e.tar.bz2 uca-d4f1fc90188820a00a74a7e5fd04f6feffa7537e.tar.xz uca-d4f1fc90188820a00a74a7e5fd04f6feffa7537e.zip |
Merge branch 'dexela_simple_packaging'
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 20 |
1 files changed, 19 insertions, 1 deletions
@@ -1,2 +1,20 @@ -tags +*~ +*.cmake +*.orig +*.rpm +_CPack_Packages build/ +CMakeFiles +install_manifest.txt +libuca.spec +Makefile +src/config.h +src/libuca.so* +tags +test/ +tools/benchmark +tools/gen-doc +tools/grab +tools/grab-async +tools/gui/control +tools/perf |