diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-06-20 22:18:37 (GMT) |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-06-20 22:18:37 (GMT) |
commit | 575b6689b13b85b58551eaee386015725cd5b82b (patch) | |
tree | 7f013737cc0564424ccab34f47e4ef638c066e2c /configure | |
parent | a0b2a36d654029a9724c15979e46da2493fd019b (diff) | |
parent | 1b49f91a3eb89523a11d7b616ad189d7bb57eff6 (diff) |
Merge branch 'upstream-git' into upstream
Conflicts (merged manually):
tests/test-web-view.py
Diffstat (limited to 'configure')
0 files changed, 0 insertions, 0 deletions