merged conflicts (>_<#)

preferencesAboutTextFull
shibakaneki 13 years ago
parent 6a109355c0
commit cc3c31c3a6
Loading…
Cancel
Save