3 Commits

Author SHA1 Message Date
kostas
b796cde81b Merged refactor
Added missing status UPDATED_BY_MERGE 
Fixed parsing of file status

FossilOrigin-Name: f82fab41453e6ccf28c60e89ce567635ffab25a3
2015-04-30 17:43:40 +00:00
kostas
dbfc4f10da Moved UICallback and ScopedCallback to Utils
FossilOrigin-Name: 717fb7a390f81af33ad40913960a30ff9c1c7a75
2015-04-30 11:43:31 +00:00
kostas
9dff9370ce Added missing Workspace.cpp/h
FossilOrigin-Name: 2e7553cddf1db1c9e22e883276829a8032dc9afb
2015-04-30 11:37:04 +00:00