[fwbuilder-commits] changes by vkurland
Brought to you by:
mikehorn
From: Vadim K. <vku...@us...> - 2004-11-13 07:31:34
|
Update of /cvsroot/fwbuilder/fwbuilder2/src/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31518/src/gui Modified Files: ObjConflictResolutionDialog.cpp pixAdvancedDialog.cpp pixAdvancedDialog.h pixadvanceddialog_q.ui Log Message: fixed bug (no number): pfctl expects "-F Sources" and "-F Tables" command line options with "Sources" and "Tables" capitalized. API change: changes in the object database merge algorithm: when an object database we are trying to merge has non-empty "Deleted objects" library, deleted objects from this library should be ignored (they used to be deleted from the current tree). Likewise, when current tree has non-empty "Deleted objects" library and objects in it match objects being merged in, objects should be removed from "Deleted objects" library to avoid creating duplicate IDs with objects being merged in. |