diff options
| author | Mark McLoughlin <mark@skynet.ie> | 2004-08-19 11:03:12 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@src.gnome.org> | 2004-08-19 11:03:12 +0000 |
| commit | 2dc7f99881c9b04725374f38b1edcd13fb2ca33d (patch) | |
| tree | 79fc721032640b3644920b90a079a76df99f01d2 /po/eu.po | |
| parent | bf00576738a9794e534c8750f885d2ed4a0f6913 (diff) | |
| download | gconf-2dc7f99881c9b04725374f38b1edcd13fb2ca33d.tar.gz | |
Revert the patch to make use of the merge-subtree feature at specific
2004-08-19 Mark McLoughlin <mark@skynet.ie>
Revert the patch to make use of the merge-subtree feature at
specific points in the tree. Not clear that it solves the
problems we thought it solved. Patch archived in bug #138498
* backends/markup-tree.[ch]:
(markup_tree_get): remove try_merge flag.
(markup_dir_sync): don't try and save as a merged subtree.
* backends/markup-backend.c: (resolve_address), (ms_new):
Remove the "nomerge" backend flag.
* backends/gconf-merge-tree.c:
(recursively_load_subtree): add back.
(merge_tree): upd. for markup_tree_get() change.
Diffstat (limited to 'po/eu.po')
0 files changed, 0 insertions, 0 deletions