changeset 2419:778c0530ecff

Merge branch 'stable'
author Volker Grabsch <vog@notjusthosting.com>
date Mon, 16 Apr 2012 16:19:08 +0200
parents f0342e9f2462 (current diff) 9acf7cdce8d6 (diff)
children 59331dfd3b6b
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.gitignore	Mon Apr 16 07:14:43 2012 -0700
+++ b/.gitignore	Mon Apr 16 16:19:08 2012 +0200
@@ -2,3 +2,4 @@
 /log/
 /pkg
 /wip/
+/tmp-*