diff options
author | McCabe Maxsted | 2010-08-28 03:02:19 -0700 |
---|---|---|
committer | Jacek Antonelli | 2010-09-16 20:39:12 -0500 |
commit | 7997913d7f8d2abfe8397ae498d339f146629a47 (patch) | |
tree | a6439a0f3a5fa81d5e5da828a6c855e41191f8c8 /README.txt | |
parent | Henri Beauchamp: use http map if possible. Fixes broken map in SL + http map ... (diff) | |
download | meta-impy-7997913d7f8d2abfe8397ae498d339f146629a47.zip meta-impy-7997913d7f8d2abfe8397ae498d339f146629a47.tar.gz meta-impy-7997913d7f8d2abfe8397ae498d339f146629a47.tar.bz2 meta-impy-7997913d7f8d2abfe8397ae498d339f146629a47.tar.xz |
Fixed unresolved merge conflict in xui/fr/floater_html.xml
Diffstat (limited to 'README.txt')
0 files changed, 0 insertions, 0 deletions