Differences
This shows you the differences between two versions of the page.
Both sides previous revision Previous revision | Next revisionBoth sides next revision | ||
lirec:version_control_guide [2009-02-04 18:34] – davegriffiths | lirec:version_control_guide [2009-02-04 18:35] – davegriffiths | ||
---|---|---|---|
Line 96: | Line 96: | ||
< | < | ||
<<<<<<< | <<<<<<< | ||
- | 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) |
>>>>>>> | >>>>>>> | ||
{ | { |