Branch 'c++/master' - 2 commits - .gitignore

[Christian Mollekopf]

 .gitignore |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 0f7a59df7e5b0e3611cdbb67b8c501a991b8c114
Merge: 35b3fbc 55d7e02
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Mon Nov 14 20:26:45 2011 +0100

    Merge branch 'master' into c++/master



commit 55d7e026f139626ba1fe69e3d22cc10e57eb2aa8
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Mon Nov 14 20:25:23 2011 +0100

    Added gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a9d2afd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*~
+CMakeFiles
+CMakeCache.txt
+moc_*
+*.moc
+*.cmake