[Monotone-commits-diffs] Revision 3ab19a199c5b4d341e16a23a65b4e71040aacfdd

[monotone]

-----------------------------------------------------------------
Revision: 3ab19a199c5b4d341e16a23a65b4e71040aacfdd
Ancestor: 1e3ed17766320bde7a046e6aa95702c344176e59
Ancestor: ae8728c22a155e25f97883e7bc8597bbd906cebf
Author: address@hidden
Date: 2006-10-02T08:34:48
Branch: net.venge.monotone.guitone

Added files:
        res/dialogs/KeyManagment.ui res/osx/README
        res/osx/Resources/de.lproj/locversion.plist
        src/view/dialogs/KeyManagment.cpp
        src/view/dialogs/KeyManagment.h
        src/view/dialogs/ui_KeyManagment.h
Added directories:
        res/osx res/osx/Resources res/osx/Resources/de.lproj
Modified files:
        README build.sh guitone.pro res/i18n/guitone_de.ts
        src/model/Inventory.cpp src/model/InventoryItem.cpp
        src/model/InventoryItem.h src/util/Settings.cpp
        src/view/Guitone.cpp src/view/Guitone.h
        src/view/TreeView.cpp src/view/TreeView.h

ChangeLog: 

merge of '1e3ed17766320bde7a046e6aa95702c344176e59'
     and 'ae8728c22a155e25f97883e7bc8597bbd906cebf'


monotone --db={your.database} diff 
--revision=1e3ed17766320bde7a046e6aa95702c344176e59 
--revision=3ab19a199c5b4d341e16a23a65b4e71040aacfdd
monotone --db={your.database} diff 
--revision=ae8728c22a155e25f97883e7bc8597bbd906cebf 
--revision=3ab19a199c5b4d341e16a23a65b4e71040aacfdd
----------------------------------------------------------------------