diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-07-10 11:46:52 (GMT) |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-07-10 11:46:52 (GMT) |
commit | 2c8e9feefe30399ede843af13ba1cbc881f5be41 (patch) | |
tree | a0b3c56256740fd29c75888b11def04b546e78f6 /config.sub | |
parent | 1275673493a1a42e470ac414f3447ef370fa5de1 (diff) | |
parent | 92ef9d298a8ca0d67a4799c0ee652b63657c83ae (diff) |
Merge branch 'upstream-git' into upstream
Conflicts (changed upstream but dropped here):
.gitignore
po/.gitignore
Diffstat (limited to 'config.sub')
0 files changed, 0 insertions, 0 deletions