[Monotone-commits-diffs] Revision 30056f517636701c9be621c586a65687162cd52a

[monotone]

-----------------------------------------------------------------
Revision: 30056f517636701c9be621c586a65687162cd52a
Ancestor: 6e9b246d00af4439b1676108483332c4984a095b
Ancestor: c03c6e63b46b8263a76f65f4f6e79e47920528e4
Author: address@hidden
Date: 2010-05-27 01.17.34
Branch: net.venge.monotone.guitone

Modified files:
        src/model/AutomateCommand.cpp src/model/AutomateCommand.h
        src/model/GetBranchLog.cpp src/model/InventoryProxyModel.cpp
        src/model/InventoryProxyModel.h

ChangeLog: 

merge of '6e9b246d00af4439b1676108483332c4984a095b'
     and 'c03c6e63b46b8263a76f65f4f6e79e47920528e4'


monotone --db={your.database} diff 
--revision=6e9b246d00af4439b1676108483332c4984a095b 
--revision=30056f517636701c9be621c586a65687162cd52a
monotone --db={your.database} diff 
--revision=c03c6e63b46b8263a76f65f4f6e79e47920528e4 
--revision=30056f517636701c9be621c586a65687162cd52a
----------------------------------------------------------------------