From: Andre Noll <maan@systemlinux.org>
Date: Tue, 6 Oct 2009 21:16:27 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.0~12
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=4108592dd3ac3a4cbee530b64c6f9c8b6a60be99;hp=-c;p=paraslash.git

Merge branch 'maint'
---

4108592dd3ac3a4cbee530b64c6f9c8b6a60be99
diff --combined .gitignore
index f050f3a1,0000ba41..d3a1fc5e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,4 +1,4 @@@
 -*.[oa]
 +objects
  foo*
  bar*
  para_*
@@@ -18,6 -18,7 +18,7 @@@ Makefile.dep
  TODO
  NONE
  aclocal.m4
+ *_command_list.c
  *_command_list.h
  *_command_list.man
  paraslash-git.tar.bz2
@@@ -29,4 -30,4 +30,4 @@@ web_syn
  confdefs.h
  conftest
  conftest.c
 -
 +GIT-VERSION-FILE