[Monotone-commits-diffs] Revision 473330aaa1b9a35785cca66fbf200faae2fae2dc

[monotone]

-----------------------------------------------------------------
Revision: 473330aaa1b9a35785cca66fbf200faae2fae2dc
Ancestor: b87117ed5d76e8f6f993312b00ae5009ceb67d76
Ancestor: e927d26c56044b2c67e87a4d4497022d53785115
Author: address@hidden
Date: 2007-02-21T11:06:49
Branch: net.venge.monotone.guitone.qanava

Deleted entries:
        guitone/res/icons/tree.png
Renamed entries:
        guitone/res/forms/databaseview.ui to 
guitone/res/forms/changeset_browser.ui
        guitone/res/forms/switch_workspace.ui to 
guitone/res/forms/select_revision.ui
        guitone/src/model/AutomateCommand.h to 
guitone/src/monotone/AutomateCommand.h
        guitone/src/model/MonotoneDelegate.cpp to 
guitone/src/monotone/MonotoneDelegate.cpp
        guitone/src/model/MonotoneDelegate.h to 
guitone/src/monotone/MonotoneDelegate.h
        guitone/src/util/StanzaParser.cpp to guitone/src/util/BasicIOParser.cpp
        guitone/src/util/StanzaParser.h to guitone/src/util/BasicIOParser.h
        guitone/src/view/dialogs/DatabaseView.cpp to 
guitone/src/view/dialogs/ChangesetBrowser.cpp
        guitone/src/view/dialogs/DatabaseView.h to 
guitone/src/view/dialogs/ChangesetBrowser.h
        guitone/src/view/dialogs/SwitchWorkspaceRevision.cpp to 
guitone/src/view/dialogs/SelectRevision.cpp
        guitone/src/view/dialogs/SwitchWorkspaceRevision.h to 
guitone/src/view/dialogs/SelectRevision.h
Added files:
        guitone/res/forms/checkout_revision.ui
        guitone/res/forms/update_workspace.ui
        guitone/src/model/Ancestors.cpp
        guitone/src/model/Ancestors.h
        guitone/src/model/GetBranchLog.cpp
        guitone/src/model/GetBranchLog.h
        guitone/src/util/AbstractParser.cpp
        guitone/src/util/AbstractParser.h
        guitone/src/view/dialogs/CheckoutRevision.cpp
        guitone/src/view/dialogs/CheckoutRevision.h
        guitone/src/view/dialogs/UpdateWorkspace.cpp
        guitone/src/view/dialogs/UpdateWorkspace.h
        libs/qanava/build/qan/qanava.vcproj
        libs/qanava/build/qanava.sln
        libs/qanava/build/vc8/qanava.sln
        libs/qanava/src/qanEdgeItem.cpp
        libs/qanava/src/qanEdgeItem.h
        libs/qanava/src/qanNodeItem.cpp
        libs/qanava/src/qanNodeItem.h
        libs/qanava/src/qanSimpleLayout.cpp
        libs/qanava/src/qanSimpleLayout.h
        libs/qanava/src/qanTreeLayout.cpp
        libs/qanava/src/qanTreeLayout.h
Added directories:
        libs/qanava/build/vc8
Modified files:
        IDEAS TODO guitone/guitone.pro
        guitone/res/forms/changeset_browser.ui
        guitone/res/forms/main_window.ui
        guitone/res/forms/preferences.ui
        guitone/res/forms/select_revision.ui guitone/res/guitone.qrc
        guitone/res/i18n/guitone_de.ts guitone/src/main.cpp
        guitone/src/model/Attributes.cpp
        guitone/src/model/Branches.cpp guitone/src/model/Branches.h
        guitone/src/model/Certs.cpp guitone/src/model/Changeset.cpp
        guitone/src/model/Changeset.h
        guitone/src/model/ChangesetModel.cpp
        guitone/src/model/ChangesetModel.h
        guitone/src/model/ContentDiff.cpp
        guitone/src/model/ContentDiff.h
        guitone/src/model/GetFile.cpp
        guitone/src/model/Inventory.cpp
        guitone/src/model/InventoryItem.cpp
        guitone/src/model/Keys.cpp guitone/src/model/Keys.h
        guitone/src/model/Manifest.cpp guitone/src/model/Manifest.h
        guitone/src/model/Select.cpp guitone/src/model/Tags.cpp
        guitone/src/monotone/Monotone.cpp
        guitone/src/monotone/MonotoneDelegate.cpp
        guitone/src/monotone/MonotoneDelegate.h
        guitone/src/util/BasicIOParser.cpp
        guitone/src/util/BasicIOParser.h
        guitone/src/util/DiffParser.cpp
        guitone/src/util/DiffParser.h guitone/src/util/Platform.cpp
        guitone/src/util/StdioParser.cpp
        guitone/src/util/StdioParser.h
        guitone/src/view/InventoryView.cpp
        guitone/src/view/InventoryView.h
        guitone/src/view/MainWindow.cpp
        guitone/src/view/MainWindow.h guitone/src/view/TreeView.cpp
        guitone/src/view/TreeView.h
        guitone/src/view/dialogs/About.cpp
        guitone/src/view/dialogs/About.h
        guitone/src/view/dialogs/AncestryGraph.cpp
        guitone/src/view/dialogs/AncestryGraph.h
        guitone/src/view/dialogs/ChangesetBrowser.cpp
        guitone/src/view/dialogs/ChangesetBrowser.h
        guitone/src/view/dialogs/Dialog.cpp
        guitone/src/view/dialogs/Dialog.h
        guitone/src/view/dialogs/GenerateKeypair.cpp
        guitone/src/view/dialogs/KeyManagement.cpp
        guitone/src/view/dialogs/RevisionManifest.cpp
        guitone/src/view/dialogs/RevisionManifest.h
        guitone/src/view/dialogs/SelectRevision.cpp
        guitone/src/view/dialogs/SelectRevision.h
        libs/qanava/build/qan/qan.pro
        libs/qanava/src/qanGraphItemView.cpp
        libs/qanava/src/qanGraphItemView.h
        libs/qanava/src/qanGraphicsView.cpp
        libs/qanava/src/qanGridItem.cpp
        libs/qanava/src/qanGridItem.h libs/qanava/src/qanLayout.cpp
        libs/qanava/src/qanLayout.h libs/qanava/src/qanNode.h

ChangeLog: 

merge of 'b87117ed5d76e8f6f993312b00ae5009ceb67d76'
     and 'e927d26c56044b2c67e87a4d4497022d53785115'


monotone --db={your.database} diff 
--revision=b87117ed5d76e8f6f993312b00ae5009ceb67d76 
--revision=473330aaa1b9a35785cca66fbf200faae2fae2dc
monotone --db={your.database} diff 
--revision=e927d26c56044b2c67e87a4d4497022d53785115 
--revision=473330aaa1b9a35785cca66fbf200faae2fae2dc
----------------------------------------------------------------------