[Monotone-commits-nodiffs] Revision 911f9f4f02b3f8a99d3c6959cc423f116803f38b

[monotone]

-----------------------------------------------------------------
Revision: 911f9f4f02b3f8a99d3c6959cc423f116803f38b
Ancestor: 3b0c5b3dd50f237892e32e59af76b03b3c3f811a
Ancestor: ef0ea2152b63b11be97882ed6e511b346de000ca
Author: address@hidden
Date: 02/04/2010 01:54:45 PM
Branch: net.venge.monotone.guitone

Modified files:
        res/forms/dialogs/generate_keypair.ui
        res/forms/dialogs/key_management.ui
        src/model/InventoryWatcher.cpp src/model/Keys.cpp
        src/model/Keys.h src/monotone/MonotoneThread.cpp
        src/monotone/MonotoneThread.h src/monotone/MonotoneUtil.cpp
        src/util/Settings.cpp src/util/Settings.h
        src/view/dialogs/GenerateKeypair.cpp
        src/view/dialogs/KeyManagement.cpp
        src/view/dialogs/Netsync.cpp

ChangeLog: 

merge of '3b0c5b3dd50f237892e32e59af76b03b3c3f811a'
     and 'ef0ea2152b63b11be97882ed6e511b346de000ca'


monotone --db={your.database} diff 
--revision=3b0c5b3dd50f237892e32e59af76b03b3c3f811a 
--revision=911f9f4f02b3f8a99d3c6959cc423f116803f38b
monotone --db={your.database} diff 
--revision=ef0ea2152b63b11be97882ed6e511b346de000ca 
--revision=911f9f4f02b3f8a99d3c6959cc423f116803f38b
----------------------------------------------------------------------