Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revisionBoth sides next revision
lirec:version_control_guide [2009-02-04 18:34] – davegriffithslirec:version_control_guide [2009-02-04 18:35] – davegriffiths
Line 96: Line 96:
 <code> <code>
 <<<<<<< .mine <<<<<<< .mine
-void GraphNode::ProcessChildrenChangedHereToo(unsigned int bufsize)+void GraphNode::ProcessChildren_I_Changed_This(unsigned int bufsize)
 ======= =======
-void GraphNode::ProcessChildrenChanged(unsigned int bufsize)+void GraphNode::ProcessChildren_I_Changed_This_Too!(unsigned int bufsize)
 >>>>>>> .r150 >>>>>>> .r150
 { {
  • lirec/version_control_guide.txt
  • Last modified: 2009-02-09 11:01
  • by 81.188.78.24