diff options
author | Alexey Yakovenko <wakeroid@gmail.com> | 2010-05-19 21:04:51 +0200 |
---|---|---|
committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-05-19 21:04:51 +0200 |
commit | 40571651057d23c7f59631372ec62dfb3d3ac855 (patch) | |
tree | 96c341d6cd8c277a51e9bf17dd788d7afb547c1b /conf.h | |
parent | 6ce1f73ca437f7bdfb52772ce8422ab909345850 (diff) | |
parent | 1568f405a8836306011803950011182f9253a620 (diff) |
Merge branch 'master' into i18n
Diffstat (limited to 'conf.h')
0 files changed, 0 insertions, 0 deletions