Merge branch 'master' of /var/www/trunk

2009-01-11 04:27:13 +00:00 · 2009-01-11 04:27:13 +00:00 · 2d6d2ee8e2
parent d96de79888 b98d8b2500
commit 2d6d2ee8e2
1 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,3 +3,4 @@ files/*
 _darcs/*
 config.php
 .htaccess
+*.tmproj