diff options
| author | sarven <csarven@plantard.controlezvous.ca> | 2009-01-15 20:05:09 +0000 |
|---|---|---|
| committer | sarven <csarven@plantard.controlezvous.ca> | 2009-01-15 20:05:09 +0000 |
| commit | b3c171d3172eef4f2fc0bc96476f05b9a731bd67 (patch) | |
| tree | 077fcd58425ef54600b64e53725d966c02055172 /.gitignore | |
| parent | d8f9628a17d5739182fdab92bf9e5202310d89f5 (diff) | |
| parent | 73c1390eb1b14e829b33e60bd370622fce32bec0 (diff) | |
Merge branch 'uiredesign' of ../evan into uiredesign
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index fb5d478fe..0c0fde801 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ _darcs/* config.php .htaccess *.tmproj +dataobject.ini |