diff options
author | Robin Houston <robin.houston@gmail.com> | 2012-02-01 22:04:40 +0000 |
---|---|---|
committer | Robin Houston <robin.houston@gmail.com> | 2012-02-01 22:04:40 +0000 |
commit | a76010c99459559a29901ed75b847384248c7c6e (patch) | |
tree | f199e3f4187091a7a7c78f7fd6901529658174f7 /script/generate_pot.sh | |
parent | 9f9befeba613deff85c2325f629e77099d44af6f (diff) | |
parent | 18c9436ba00574d44dc258a2f231d4758b378eae (diff) |
Merge branch 'wdtk' into release/0.5
Conflicts:
locale/app.pot
Diffstat (limited to 'script/generate_pot.sh')
0 files changed, 0 insertions, 0 deletions