[Monotone-commits-diffs] Revision 94dbfea72d75f057276e56be497fb8d337001825

[monotone]

-----------------------------------------------------------------
Revision: 94dbfea72d75f057276e56be497fb8d337001825
Ancestor: 3fee1f0ca17860c64f637354d23a0e04a1c2041f
Ancestor: 95eafcddccd76e54e68041dda44ed0b63806f264
Author: address@hidden
Date: 2009-09-01T21:53:39
Branch: net.venge.monotone.guitone

Deleted entries:
        res/forms/main_window.ui
Renamed entries:
        doxygen.conf to attic/doxygen.conf
        res/forms/about.ui to res/forms/dialogs/about.ui
        res/forms/add_edit_attribute.ui to 
res/forms/dialogs/add_edit_attribute.ui
        res/forms/add_edit_variables.ui to 
res/forms/dialogs/add_edit_variables.ui
        res/forms/application_update.ui to 
res/forms/dialogs/application_update.ui
        res/forms/changeset_browser.ui to res/forms/dialogs/changeset_browser.ui
        res/forms/checkout_revision.ui to res/forms/dialogs/checkout_revision.ui
        res/forms/commit_revision.ui to res/forms/dialogs/commit_revision.ui
        res/forms/create_database.ui to res/forms/dialogs/create_database.ui
        res/forms/db_variables.ui to res/forms/panels/db_variables.ui
        res/forms/file_diff.ui to res/forms/dialogs/file_diff.ui
        res/forms/file_history.ui to res/forms/dialogs/file_history.ui
        res/forms/generate_keypair.ui to res/forms/dialogs/generate_keypair.ui
        res/forms/icon_help.ui to res/forms/panels/icon_help.ui
        res/forms/key_management.ui to res/forms/dialogs/key_management.ui
        res/forms/manifest.ui to res/forms/dialogs/manifest.ui
        res/forms/message.ui to res/forms/dialogs/message.ui
        res/forms/nodeinfo.ui to res/forms/panels/nodeinfo.ui
        res/forms/open_prompt.ui to res/forms/dialogs/open_prompt.ui
        res/forms/preferences.ui to res/forms/dialogs/preferences.ui
        res/forms/revision_diff.ui to res/forms/dialogs/revision_diff.ui
        res/forms/select_revision.ui to res/forms/dialogs/select_revision.ui
        res/forms/unaccounted_renames.ui to 
res/forms/dialogs/unaccounted_renames.ui
        res/forms/update_workspace.ui to res/forms/dialogs/update_workspace.ui
        src/view/AttributesView.cpp to src/view/widgets/AttributesView.cpp
        src/view/AttributesView.h to src/view/widgets/AttributesView.h
        src/view/ChangeLogEdit.cpp to src/view/widgets/ChangeLogEdit.cpp
        src/view/ChangeLogEdit.h to src/view/widgets/ChangeLogEdit.h
        src/view/ColorPicker.cpp to src/view/widgets/ColorPicker.cpp
        src/view/ColorPicker.h to src/view/widgets/ColorPicker.h
        src/view/DatabaseMenuBar.cpp to src/view/widgets/DatabaseMenuBar.cpp
        src/view/DatabaseMenuBar.h to src/view/widgets/DatabaseMenuBar.h
        src/view/DatabaseWindow.cpp to src/view/mainwindows/DatabaseWindow.cpp
        src/view/DatabaseWindow.h to src/view/mainwindows/DatabaseWindow.h
        src/view/DiffStatusView.cpp to src/view/widgets/DiffStatusView.cpp
        src/view/DiffStatusView.h to src/view/widgets/DiffStatusView.h
        src/view/InventoryView.cpp to src/view/widgets/InventoryView.cpp
        src/view/InventoryView.h to src/view/widgets/InventoryView.h
        src/view/InventoryViewDelegate.cpp to 
src/view/widgets/InventoryViewDelegate.cpp
        src/view/InventoryViewDelegate.h to 
src/view/widgets/InventoryViewDelegate.h
        src/view/MainWindow.cpp to src/view/mainwindows/MainWindow.cpp
        src/view/MainWindow.h to src/view/mainwindows/MainWindow.h
        src/view/MenuBar.cpp to src/view/widgets/MenuBar.cpp
        src/view/MenuBar.h to src/view/widgets/MenuBar.h
        src/view/Splitter.cpp to src/view/widgets/Splitter.cpp
        src/view/Splitter.h to src/view/widgets/Splitter.h
        src/view/ToolBox.cpp to src/view/widgets/ToolBox.cpp
        src/view/ToolBox.h to src/view/widgets/ToolBox.h
        src/view/TreeView.cpp to src/view/widgets/TreeView.cpp
        src/view/TreeView.h to src/view/widgets/TreeView.h
        src/view/WorkspaceMenuBar.cpp to src/view/widgets/WorkspaceMenuBar.cpp
        src/view/WorkspaceMenuBar.h to src/view/widgets/WorkspaceMenuBar.h
        src/view/WorkspaceWindow.cpp to src/view/mainwindows/WorkspaceWindow.cpp
        src/view/WorkspaceWindow.h to src/view/mainwindows/WorkspaceWindow.h
        tests to attic/tests
Added files:
        attic/CheckableList.cpp attic/CheckableList.h attic/README
        attic/WorkspaceAction.cpp attic/WorkspaceAction.h
        attic/confirm_item_action.ui
        attic/fix_inventory_watcher_with_viewport_only_watching.diff
        attic/gitk_like_revision_graph.diff
        attic/setup_our_own_crash_handler.diff
        attic/workspace_action.ui attic/workspace_actions.diff
Added directories:
        res/forms/dialogs res/forms/panels res/forms/widgets
        src/view/mainwindows src/view/widgets
Modified files:
        guitone.pro res/forms/dialogs/file_diff.ui
        res/forms/dialogs/file_history.ui
        res/forms/panels/db_variables.ui

ChangeLog: 

merge of '3fee1f0ca17860c64f637354d23a0e04a1c2041f'
     and '95eafcddccd76e54e68041dda44ed0b63806f264'


monotone --db={your.database} diff 
--revision=3fee1f0ca17860c64f637354d23a0e04a1c2041f 
--revision=94dbfea72d75f057276e56be497fb8d337001825
monotone --db={your.database} diff 
--revision=95eafcddccd76e54e68041dda44ed0b63806f264 
--revision=94dbfea72d75f057276e56be497fb8d337001825
----------------------------------------------------------------------