[Monotone-commits-diffs] Revision 135155641d199ca638f404299273f50f30a2ca34

[monotone]

-----------------------------------------------------------------
Revision: 135155641d199ca638f404299273f50f30a2ca34
Ancestor: 0681b3a547d13b64f59561c7006d75bed61ada37
Ancestor: a815b6a81cf3392e05415a553e754700c29d460a
Author: address@hidden
Date: 2006-11-27T20:21:21
Branch: net.venge.monotone.guitone

Added files:
        guitone/src/view/dialogs/FileDiff.cpp
        guitone/src/view/dialogs/FileDiff.h
Modified files:
        guitone/src/model/InventoryItem.cpp
        guitone/src/model/InventoryItem.h
        guitone/src/model/InventoryProxyModel.cpp
        guitone/src/view/InventoryView.cpp

ChangeLog: 

merge of '0681b3a547d13b64f59561c7006d75bed61ada37'
     and 'a815b6a81cf3392e05415a553e754700c29d460a'


monotone --db={your.database} diff 
--revision=0681b3a547d13b64f59561c7006d75bed61ada37 
--revision=135155641d199ca638f404299273f50f30a2ca34
monotone --db={your.database} diff 
--revision=a815b6a81cf3392e05415a553e754700c29d460a 
--revision=135155641d199ca638f404299273f50f30a2ca34
----------------------------------------------------------------------