From 9f819088a67a555d7bf18bf1da5db1ff66163055 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Sat, 22 Jun 2013 22:35:53 +0200
Subject: gitignore update

 * git should now ignore all generated files when building without
   separate build directory
---
 .gitignore               | 23 +++++++++++++----------
 data                     |  2 +-
 desktop/.gitignore       |  7 ++++++-
 lib/clipboard/.gitignore |  1 +
 po/.gitignore            |  1 +
 src/CBot/.gitignore      |  1 +
 src/common/.gitignore    |  2 ++
 7 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 lib/clipboard/.gitignore
 create mode 100644 po/.gitignore
 create mode 100644 src/CBot/.gitignore
 create mode 100644 src/common/.gitignore

diff --git a/.gitignore b/.gitignore
index d2c6fbc..122663d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,15 @@
-# Ignore the documentation folder
+# Ignore the CMake build files
+CMakeFiles
+CMakeCache.txt
+cmake_install.cmake
+Makefile
+/install_manifest.txt
+/Testing
+/CTestTestfile.cmake
+
+# Ignore the generated documentation
 /doc
+/Doxyfile
 
 # Ignore targets
 /colobot
@@ -8,16 +18,9 @@
 /colobot.ini
 /savegame
 
-# Ignore the CMake build files
-CMakeFiles
-CMakeCache.txt
-cmake_install.cmake
-Makefile
-/install_manifest.txt
-/Testing
-/CTestTestfile.cmake
+# Standard build directory
+/build
 
 # Ignore KDevelop files
 .kdev4
 *.kdev4
-
diff --git a/data b/data
index 6d1ff8c..b2845f5 160000
--- a/data
+++ b/data
@@ -1 +1 @@
-Subproject commit 6d1ff8c3c48f8492824d27a621ecd8fb5879b182
+Subproject commit b2845f58c34fc60e1f3900e5544f6392ca170fa8
diff --git a/desktop/.gitignore b/desktop/.gitignore
index 0e770f7..e6649e0 100644
--- a/desktop/.gitignore
+++ b/desktop/.gitignore
@@ -1,2 +1,7 @@
 lang/
-
+fr/
+16/
+32/
+48/
+colobot.6
+colobot.desktop
diff --git a/lib/clipboard/.gitignore b/lib/clipboard/.gitignore
new file mode 100644
index 0000000..ffbe18e
--- /dev/null
+++ b/lib/clipboard/.gitignore
@@ -0,0 +1 @@
+libclipboard.a
diff --git a/po/.gitignore b/po/.gitignore
new file mode 100644
index 0000000..becd153
--- /dev/null
+++ b/po/.gitignore
@@ -0,0 +1 @@
+*.gmo
diff --git a/src/CBot/.gitignore b/src/CBot/.gitignore
new file mode 100644
index 0000000..4c80252
--- /dev/null
+++ b/src/CBot/.gitignore
@@ -0,0 +1 @@
+libCBot.so
diff --git a/src/common/.gitignore b/src/common/.gitignore
new file mode 100644
index 0000000..a13f82d
--- /dev/null
+++ b/src/common/.gitignore
@@ -0,0 +1,2 @@
+# CMake config header
+config.h
-- 
cgit v1.2.3-1-g7c22