summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2010-07-22 21:32:18 -0500
committerDavid Athay <ko2fan@gmail.com>2010-07-22 21:32:18 -0500
commit721edd0356bdfa14389b1520ebee33f8e4b55167 (patch)
tree542f56d34be49a16650460486df9edba52be0e8c
parent47ce39b8d79a62f43213df422d38a58b41f0ed07 (diff)
parent89765ba6256ee39bf034ae6fddf9adacca6dbdd1 (diff)
downloadmana-client-721edd0356bdfa14389b1520ebee33f8e4b55167.tar.gz
mana-client-721edd0356bdfa14389b1520ebee33f8e4b55167.tar.bz2
mana-client-721edd0356bdfa14389b1520ebee33f8e4b55167.tar.xz
mana-client-721edd0356bdfa14389b1520ebee33f8e4b55167.zip
Merge branch '1.0' of gitorious.org:mana/mana into 1.0
-rw-r--r--.gitignore5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 7bca3e65..0eab78b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,8 @@ stamp-h1
# files created by CMake
CMakeFiles/
CMakeCache.txt
+CPackConfig.cmake
+CPackSourceConfig.cmake
cmake_install.cmake
install_manifest.txt
@@ -73,3 +75,6 @@ translations/*
# documentation generated by Doxygen
docs/SOURCE/html/*
+
+# patch files created by git
+[0-9][0-9][0-9][0-9]-*.patch