summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorGravatar Stephane Glondu <steph@glondu.net>2010-12-01 13:33:59 +0100
committerGravatar Stephane Glondu <steph@glondu.net>2010-12-01 13:33:59 +0100
commitaa51449cb692a9a1d183b2663679645aba16b036 (patch)
treef32b2fd38d3442e4d583009cb09cbac701c33bc0 /.gitignore
parenta3c2b799e0eceb0896af062887c762c654d2e2f6 (diff)
parent8ab748064ddeec8400859e210bf9963826cba631 (diff)
Merge commit 'upstream/0.2.1'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 845ca06..ce3c045 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+doc
+html
.pc