[Monotone-commits-diffs] Revision 7274adbb2143437bb0c87ad143e150a15e6ead9d

[monotone]

-----------------------------------------------------------------
Revision: 7274adbb2143437bb0c87ad143e150a15e6ead9d
Ancestor: 1a07f6fa872735dc989e5e55c6fc7a22c8f1de47
Ancestor: 8cf4e405f7b0326a8d343610d2b95e6b125fd1c6
Author: address@hidden
Date: 2007-04-24T17:05:24
Branch: net.venge.monotone.guitone

Added files:
        res/osx/Resources/en.lproj/locversion.plist
        tests/MonotoneTest.h
Added directories:
        res/osx/Resources/en.lproj
Modified files:
        README res/forms/file_diff.ui res/forms/file_history.ui
        res/i18n/guitone_de.ts src/model/ContentDiff.cpp
        src/model/ContentDiff.h src/model/GetFile.cpp
        src/model/GetFile.h src/model/Inventory.cpp
        src/monotone/Monotone.cpp src/util/DiffParser.cpp
        src/view/dialogs/ApplicationUpdate.cpp
        src/view/dialogs/FileDiff.cpp src/view/dialogs/FileDiff.h
        src/view/dialogs/FileHistory.cpp
        src/view/dialogs/FileHistory.h tests/test.cpp tests/test.pro

ChangeLog: 

merge of '1a07f6fa872735dc989e5e55c6fc7a22c8f1de47'
     and '8cf4e405f7b0326a8d343610d2b95e6b125fd1c6'


monotone --db={your.database} diff 
--revision=1a07f6fa872735dc989e5e55c6fc7a22c8f1de47 
--revision=7274adbb2143437bb0c87ad143e150a15e6ead9d
monotone --db={your.database} diff 
--revision=8cf4e405f7b0326a8d343610d2b95e6b125fd1c6 
--revision=7274adbb2143437bb0c87ad143e150a15e6ead9d
----------------------------------------------------------------------