[Monotone-commits-diffs] Revision 741ee8a8b2090db8531620b29c9d7c39d2525fee

[monotone]

-----------------------------------------------------------------
Revision: 741ee8a8b2090db8531620b29c9d7c39d2525fee
Ancestor: ace3140109bcd98c2aeb7719af6ca8fa521e3457
Ancestor: fe1fa4d2ebd8e602689ce4596604b78e5f9aa5f9
Author: address@hidden
Date: 2008-04-08T11:55:47
Branch: net.venge.monotone.guitone

Added files:
        res/win32/guitone.bmp
Modified files:
        NEWS guitone.pro notes/IDEAS res/forms/preferences.ui
        res/i18n/guitone_de.ts src/Guitone.cpp
        src/monotone/MonotoneManager.cpp
        src/monotone/MonotoneManager.h src/util/Platform.cpp
        src/view/dialogs/KeyManagement.cpp
        src/view/dialogs/KeyManagement.h
        src/view/dialogs/Preferences.cpp
        src/view/dialogs/Preferences.h
Modified attrs:
        res/win32/guitone.bmp

ChangeLog: 

merge of 'ace3140109bcd98c2aeb7719af6ca8fa521e3457'
     and 'fe1fa4d2ebd8e602689ce4596604b78e5f9aa5f9'


monotone --db={your.database} diff 
--revision=ace3140109bcd98c2aeb7719af6ca8fa521e3457 
--revision=741ee8a8b2090db8531620b29c9d7c39d2525fee
monotone --db={your.database} diff 
--revision=fe1fa4d2ebd8e602689ce4596604b78e5f9aa5f9 
--revision=741ee8a8b2090db8531620b29c9d7c39d2525fee
----------------------------------------------------------------------