[Monotone-commits-diffs] Revision f35ab4fe461be7e3214b709443ae97b26e110802

[monotone]

-----------------------------------------------------------------
Revision: f35ab4fe461be7e3214b709443ae97b26e110802
Ancestor: 5ce91fe0cc3abf6be77ebe343542232ccdebc61a
Ancestor: 9165b4b5390e2db4880314aa59c0b6e85782c1a1
Author: address@hidden
Date: 2007-05-02T09:22:10
Branch: net.venge.monotone.guitone

Modified files:
        notes/RELEASE_CHECKLIST res/forms/file_diff.ui
        res/i18n/guitone_de.ts src/Guitone.h src/model/GetFile.cpp
        src/model/GetFile.h src/util/DebugLog.cpp
        src/util/DebugLog.h src/view/dialogs/FileDiff.cpp
        src/view/dialogs/FileDiff.h src/view/dialogs/Preferences.cpp
        src/vocab.h

ChangeLog: 

merge of '5ce91fe0cc3abf6be77ebe343542232ccdebc61a'
     and '9165b4b5390e2db4880314aa59c0b6e85782c1a1'


monotone --db={your.database} diff 
--revision=5ce91fe0cc3abf6be77ebe343542232ccdebc61a 
--revision=f35ab4fe461be7e3214b709443ae97b26e110802
monotone --db={your.database} diff 
--revision=9165b4b5390e2db4880314aa59c0b6e85782c1a1 
--revision=f35ab4fe461be7e3214b709443ae97b26e110802
----------------------------------------------------------------------