diff options
| author | sarven <csarven@plantard.controlezvous.ca> | 2009-01-15 23:47:43 +0000 |
|---|---|---|
| committer | sarven <csarven@plantard.controlezvous.ca> | 2009-01-15 23:47:43 +0000 |
| commit | d3092274c25e9ee8b0fa729a5f3a35df7dde276c (patch) | |
| tree | 8b565ea3cee475e71e7c9ad392f26af60960c227 /.gitignore | |
| parent | a18351bc390cc0c4081286220120a6b5e8402a19 (diff) | |
| parent | c73ed29cb7977de759379249d0932f5fa62b179b (diff) | |
Merge branch 'uiredesign' of ../evan into uiredesign
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 0c0fde801..8c94886e7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ config.php .htaccess *.tmproj dataobject.ini +*~ +*.bak |