diff options
author | Alexey Yakovenko <wakeroid@gmail.com> | 2010-05-23 14:04:21 +0200 |
---|---|---|
committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-05-23 14:04:21 +0200 |
commit | 734685586bfe193097defa77ca607b19b3f87f44 (patch) | |
tree | a187d8fe129f51bb33ca63442d82fad93fab1140 /autogen.sh | |
parent | 39ce5b6e7b5829f2e3552f8a6cba49767478d2e8 (diff) | |
parent | 7149aa6e4e7cb1bd71d1a0cb41f48000d5416941 (diff) |
Merge branch 'master' into i18n
Conflicts:
main.c
Diffstat (limited to 'autogen.sh')
0 files changed, 0 insertions, 0 deletions