| author | waspe <waspe> | 2003-11-03 18:29:32 (UTC) |
|---|---|---|
| committer | waspe <waspe> | 2003-11-03 18:29:32 (UTC) |
| commit | 3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c (patch) (side-by-side diff) | |
| tree | 96119aac19a49850a221d34f3152fa12b0a86a46 /plugins/networksettings | |
| parent | 87a9d6badcf518ffd14559ef886ff7729b63b73b (diff) | |
| download | opie-3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c.zip opie-3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c.tar.gz opie-3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c.tar.bz2 | |
remove merge conflict
0 files changed, 0 insertions, 0 deletions