diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-14 18:59:57 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-14 18:59:57 +0200 |
| commit | e06edb350878c1c1414e243df23b789a6266d2d3 (patch) | |
| tree | d0b61c39216c674225d0e8faea1710dc1c34fe8c /.gitmodules | |
| parent | 2b7136af76f5020af7a09342037ef4858472d58f (diff) | |
| parent | 00d14a048bfbcc85c905ab2c22b122e63c1de8d3 (diff) | |
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved):
.gitignore
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions