[Monotone-commits-diffs] Revision e97d3a4396e8e7c3524aeec3bd139ccda0a96009

[monotone]

-----------------------------------------------------------------
Revision: e97d3a4396e8e7c3524aeec3bd139ccda0a96009
Ancestor: 0b801bc68d924905f6cd390fb8ae816b91948439
Ancestor: 1a4b27439a3ba667ed6c8abf1d527db834d4f0ea
Author: address@hidden
Date: 2007-01-08T11:32:49
Branch: net.venge.monotone.guitone.databaseview

Deleted entries:
        guitone/res/dialogs/ancestry_graph.ui
Renamed entries:
        guitone/res/dialogs to guitone/res/forms
        guitone/src/view/Guitone.cpp to guitone/src/view/MainWindow.cpp
        guitone/src/view/Guitone.h to guitone/src/view/MainWindow.h
Added files:
        guitone/res/forms/main_window.ui
Modified files:
        .mtn-ignore README guitone/guitone.pro
        guitone/res/forms/key_management.ui
        guitone/res/forms/switch_workspace.ui
        guitone/res/i18n/guitone_de.ts guitone/src/main.cpp
        guitone/src/model/Attributes.cpp
        guitone/src/model/AutomateCommand.cpp
        guitone/src/model/AutomateCommand.h
        guitone/src/model/Branches.cpp guitone/src/model/Certs.cpp
        guitone/src/model/ContentDiff.cpp
        guitone/src/model/ContentDiff.h
        guitone/src/model/GetFile.cpp guitone/src/model/GetFile.h
        guitone/src/model/Inventory.cpp
        guitone/src/model/Inventory.h
        guitone/src/model/InventoryProxyModel.cpp
        guitone/src/model/InventoryProxyModel.h
        guitone/src/model/Keys.cpp guitone/src/model/Select.cpp
        guitone/src/model/Select.h guitone/src/model/Tags.cpp
        guitone/src/model/Toposort.cpp guitone/src/model/Toposort.h
        guitone/src/monotone/Monotone.cpp
        guitone/src/monotone/Monotone.h
        guitone/src/util/DiffParser.cpp
        guitone/src/util/IconProvider.cpp
        guitone/src/util/Settings.cpp guitone/src/util/Settings.h
        guitone/src/util/TreeBuilder.cpp
        guitone/src/util/TreeBuilder.h
        guitone/src/view/AttributesView.cpp
        guitone/src/view/AttributesView.h
        guitone/src/view/DiffStatusView.cpp
        guitone/src/view/DiffStatusView.h
        guitone/src/view/DiffView.cpp
        guitone/src/view/InventoryView.cpp
        guitone/src/view/InventoryView.h
        guitone/src/view/MainWindow.cpp
        guitone/src/view/MainWindow.h guitone/src/view/Splitter.cpp
        guitone/src/view/TreeView.cpp
        guitone/src/view/dialogs/FileDiff.cpp
        guitone/src/view/dialogs/FileDiff.h
        guitone/src/view/dialogs/GenerateKeypair.cpp
        guitone/src/view/dialogs/KeyManagement.cpp
        guitone/src/view/dialogs/KeyManagement.h
        guitone/src/view/dialogs/Preferences.cpp
        guitone/src/view/dialogs/RevisionDiff.cpp
        guitone/src/view/dialogs/RevisionDiff.h
        guitone/src/view/dialogs/SwitchWorkspaceRevision.cpp
        guitone/src/view/dialogs/SwitchWorkspaceRevision.h

ChangeLog: 

merge of '0b801bc68d924905f6cd390fb8ae816b91948439'
     and '1a4b27439a3ba667ed6c8abf1d527db834d4f0ea'


monotone --db={your.database} diff 
--revision=0b801bc68d924905f6cd390fb8ae816b91948439 
--revision=e97d3a4396e8e7c3524aeec3bd139ccda0a96009
monotone --db={your.database} diff 
--revision=1a4b27439a3ba667ed6c8abf1d527db834d4f0ea 
--revision=e97d3a4396e8e7c3524aeec3bd139ccda0a96009
----------------------------------------------------------------------