diff options
| author | Josselin Mouette <joss@debian.org> | 2010-04-03 13:51:25 +0200 |
|---|---|---|
| committer | Josselin Mouette <joss@debian.org> | 2010-04-03 13:51:25 +0200 |
| commit | a99563cfccc7376e377d74ceffa20b97007cf711 (patch) | |
| tree | 209d75276eb0558450ec194753cb6bbe4333eb3e /po/kn.po | |
| parent | 379145060b8fc90fa7c81c0bff20d025e61adc38 (diff) | |
| parent | db4fc8e1373a6892ddbf4bf254a91c78f5ee6a42 (diff) | |
| download | yelp-a99563cfccc7376e377d74ceffa20b97007cf711.tar.gz | |
Merge branch 'gnome-2-30' into webkit
Conflicts:
src/yelp-html.c
src/yelp-window.c
stylesheets/db2html.xsl.in
Excluding commit a5588114ed94d00ca64913aa5b248e09a5e13edc
Diffstat (limited to 'po/kn.po')
0 files changed, 0 insertions, 0 deletions