[Monotone-commits-diffs] Revision 7282cb7ec3e02e9bd4bf6e5b0d9af52f488ed317

[monotone]

-----------------------------------------------------------------
Revision: 7282cb7ec3e02e9bd4bf6e5b0d9af52f488ed317
Ancestor: 0806e0e2ed07bac10c5c180bd803b541381aa138
Ancestor: 329101015e38291dd1d359be857d17500ebd95d6
Author: address@hidden
Date: 2008-01-11T01:29:37
Branch: net.venge.monotone.guitone

Modified files:
        src/Guitone.cpp src/Guitone.h src/model/GetAttributes.cpp
        src/model/GetAttributes.h src/model/Inventory.cpp
        src/model/Inventory.h src/model/InventoryItem.cpp
        src/model/InventoryItem.h src/view/AttributesView.cpp
        src/view/AttributesView.h src/view/InventoryView.cpp

ChangeLog: 

merge of '0806e0e2ed07bac10c5c180bd803b541381aa138'
     and '329101015e38291dd1d359be857d17500ebd95d6'


monotone --db={your.database} diff 
--revision=0806e0e2ed07bac10c5c180bd803b541381aa138 
--revision=7282cb7ec3e02e9bd4bf6e5b0d9af52f488ed317
monotone --db={your.database} diff 
--revision=329101015e38291dd1d359be857d17500ebd95d6 
--revision=7282cb7ec3e02e9bd4bf6e5b0d9af52f488ed317
----------------------------------------------------------------------