summaryrefslogtreecommitdiffstats
path: root/src/desktop/.gitignore
diff options
context:
space:
mode:
authorMichał Zieliński <michal@zielinscy.org.pl>2012-12-27 12:55:59 +0100
committerMichał Zieliński <michal@zielinscy.org.pl>2012-12-27 12:55:59 +0100
commitcf65681f8029c2c1e5f18cc3776bdb09c8bd1db0 (patch)
tree52816490c878fc5f57a97e3c2357d934cb70e294 /src/desktop/.gitignore
parent9f3acdcdde36ece74a848370776b2751d20f1c3d (diff)
downloadcolobot-cf65681f8029c2c1e5f18cc3776bdb09c8bd1db0.tar.gz
colobot-cf65681f8029c2c1e5f18cc3776bdb09c8bd1db0.tar.bz2
colobot-cf65681f8029c2c1e5f18cc3776bdb09c8bd1db0.zip
Revert "Merge branch 'dev-desktop-file-man' of https://github.com/OdyX/colobot"
This reverts commit 9f3acdcdde36ece74a848370776b2751d20f1c3d, reversing changes made to fb13c0f219282ef888562fb0fcbbeefd915307d4.
Diffstat (limited to 'src/desktop/.gitignore')
-rw-r--r--src/desktop/.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/desktop/.gitignore b/src/desktop/.gitignore
deleted file mode 100644
index bade6f3..0000000
--- a/src/desktop/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-lang/