This is the complete list of members for KIGIT_PCB_MERGE, including all inherited members.

both_modified	KIGIT_PCB_MERGE	private
compareBoards(BOARD aAncestor, BOARD aOther)	KIGIT_PCB_MERGE	protected
findSetDifferences(const BOARD_ITEM_SET &aAncestorSet, const BOARD_ITEM_SET &aOtherSet, std::vector< BOARD_ITEM * > &aAdded, std::vector< BOARD_ITEM * > &aRemoved, std::vector< BOARD_ITEM * > &aChanged)	KIGIT_PCB_MERGE	protected
GetBothModified()	KIGIT_PCB_MERGE	inline
GetTheyModifiedWeDeleted()	KIGIT_PCB_MERGE	inline
GetWeModifiedTheyDeleted()	KIGIT_PCB_MERGE	inline
KIGIT_PCB_MERGE(git_merge_driver_source aSource, git_buf aBuf)	KIGIT_PCB_MERGE	inline
m_mergeDriver	KIGIT_PCB_MERGE	private
m_result	KIGIT_PCB_MERGE	private
Merge()	KIGIT_PCB_MERGE
readBoard(wxString &aFilename)	KIGIT_PCB_MERGE	protected
they_modified_we_deleted	KIGIT_PCB_MERGE	private
we_modified_they_deleted	KIGIT_PCB_MERGE	private
~KIGIT_PCB_MERGE()	KIGIT_PCB_MERGE	virtual