diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-15 09:10:57 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-15 09:10:57 +0200 |
| commit | e037fc5228747c7e0d5a3609471943d371c9def5 (patch) | |
| tree | 6509d44cfe545cbfa4d124c06a9b2215def7352a /.gitignore | |
| parent | ee222c059e5e3c68666bb9a60a491be6eba33943 (diff) | |
| parent | 40455f89a08242e5a7417133304953d5a9b1c5bb (diff) | |
Merge branch 'allinone-da' into allinone-multilang
Conflicts (manually resolved):
Makefile
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions