C:\mlponline\ClientCode>hg log -l 10
changeset:   215:7ba197ca7d4a
tag:         tip
parent:      212:ad29848224d5
parent:      118:110176c0d2a6
user:        Trainee
date:        Wed Aug 31 20:38:40 2011 -0400
summary:     Merged together files from the latest pull.

changeset:   214:e5e5cf94ff7c
branch:      Combat-Simulator-Integration
user:        Salty Justice <saltyjustice@hotmail.com>
date:        Mon Aug 29 16:22:53 2011 -0600
summary:     Changed hgignore to allow for placeholders in a folder.

changeset:   213:147ec80157c3
branch:      Combat-Simulator-Integration
user:        Salty Justice <saltyjustice@hotmail.com>
date:        Mon Aug 29 15:27:48 2011 -0600
summary:     First push of this branch, begin insertion.

changeset:   212:ad29848224d5
user:        Salty Justice <saltyjustice@hotmail.com>
date:        Mon Aug 29 10:38:08 2011 -0600
summary:     Clicking the dialogue manager will instantly display text.

changeset:   211:d71a67e6eef9
user:        Toasty Justice <toastyjustice@gmail.com>
date:        Sun Aug 28 12:11:35 2011 -0600
summary:     Added DELETE.ME file for the Data\Decompressed folder.

changeset:   210:eb563372bc38
parent:      207:6e27599b0250
user:        Salty Justice <saltyjustice@hotmail.com>
date:        Sun Aug 28 11:59:56 2011 -0600
summary:     Finished variable delay text, need to add response options and "fast foward" option.

changeset:   209:a14745a87577
branch:      trainee_unstable
parent:      207:6e27599b0250
user:        Trainee
date:        Sat Aug 27 13:34:04 2011 -0400
summary:     Created trainee_unstable branch.

changeset:   208:ce7639c864b3
branch:      working_withNPC_centerCamera
parent:      205:d5d6a59078e3
user:        Trainee
date:        Sat Aug 27 13:10:48 2011 -0400
summary:     Closing this branch.

changeset:   207:6e27599b0250
parent:      206:c9903ff562ce
parent:      205:d5d6a59078e3
user:        Trainee
date:        Sat Aug 27 13:08:31 2011 -0400
summary:     Merged my changes into the default branch

changeset:   206:c9903ff562ce
parent:      201:dbc20356b145
user:        Salty Justice <saltyjustice@hotmail.com>
date:        Sat Aug 27 10:59:33 2011 -0600
summary:     Fixed directories bug, added Twilight in for a dialogue manager test (not working yet)


C:\mlponline\ClientCode>hg parent
changeset:   215:7ba197ca7d4a
tag:         tip
parent:      212:ad29848224d5
parent:      118:110176c0d2a6
user:        Trainee
date:        Wed Aug 31 20:38:40 2011 -0400
summary:     Merged together files from the latest pull.


C:\mlponline\ClientCode>hg heads
changeset:   215:7ba197ca7d4a
tag:         tip
parent:      212:ad29848224d5
parent:      118:110176c0d2a6
user:        Trainee
date:        Wed Aug 31 20:38:40 2011 -0400
summary:     Merged together files from the latest pull.

changeset:   214:e5e5cf94ff7c
branch:      Combat-Simulator-Integration
user:        Salty Justice <saltyjustice@hotmail.com>
date:        Mon Aug 29 16:22:53 2011 -0600
summary:     Changed hgignore to allow for placeholders in a folder.

changeset:   209:a14745a87577
branch:      trainee_unstable
parent:      207:6e27599b0250
user:        Trainee
date:        Sat Aug 27 13:34:04 2011 -0400
summary:     Created trainee_unstable branch.

changeset:   202:3e6d85b335d8
branch:      dcnWorkingCopy
parent:      198:fd8ecb5ee525
user:        Dancinninja
date:        Thu Aug 25 15:55:10 2011 -0700
summary:     Still trying to get OpenGL to work. Mostly comments and "tries". I left these


C:\mlponline\ClientCode>