diff options
| author | Oli <olivier.belanger@umontreal.ca> | 2007-10-29 22:56:59 (GMT) |
|---|---|---|
| committer | Oli <olivier.belanger@umontreal.ca> | 2007-10-29 22:56:59 (GMT) |
| commit | 38405c6c083fa4a9a9866f3f48e13ff617029003 (patch) | |
| tree | 4b864ec989915c65657e6aff9f10bd5feebfedb8 | |
| parent | 2e4c688814c38ac5b25a571553b1b1099477de5e (diff) | |
| parent | be764bdf8250fd807ede018bf357409a2d483c03 (diff) | |
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | TamTamMini.activity/.DS_Store | bin | 6148 -> 0 bytes |
2 files changed, 1 insertions, 1 deletions
@@ -3,4 +3,4 @@ *.kpf *.xo locale -._*
\ No newline at end of file +._* diff --git a/TamTamMini.activity/.DS_Store b/TamTamMini.activity/.DS_Store Binary files differdeleted file mode 100644 index 6926115..0000000 --- a/TamTamMini.activity/.DS_Store +++ /dev/null |