diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-05-17 21:25:22 +0200 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-05-17 21:25:22 +0200 |
| commit | cafa41031499e9dff3a0c4f9f30d822c981d0ce2 (patch) | |
| tree | 58f37717c06a9d98e3b5c01d3b6240954598781f /moduleconf.h | |
| parent | 229606b402f71bfe6c0ccd68b355f9f4172ba3d6 (diff) | |
| parent | d5eeb44a9d05a1b8072fc090fe07d7a13a8bfb06 (diff) | |
Merge branch 'master' into i18n
Conflicts:
plugins/gtkui/callbacks.c
plugins/gtkui/prefwin.c
Diffstat (limited to 'moduleconf.h')
0 files changed, 0 insertions, 0 deletions