diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2010-06-09 13:01:36 +0200 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2010-06-09 13:01:36 +0200 |
| commit | 0d78e2d2cdb4f3ff8617040ec7a42c2fd7987cef (patch) | |
| tree | 7cb718486d45e5099b92dfb4d7bf8fc2097a16df /.gitignore | |
| parent | 1c041c44a43905d31fc14a8b209e13f8d1f42e33 (diff) | |
| parent | 7ca5e0fbb1e55806a53bcfe7e9747f1b881505a7 (diff) | |
| download | zcatch-0d78e2d2cdb4f3ff8617040ec7a42c2fd7987cef.tar.gz zcatch-0d78e2d2cdb4f3ff8617040ec7a42c2fd7987cef.zip | |
Merge remote branch 'fujnky/master'
Conflicts: data/languages/portuguese.txt
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions