Context Navigation

LevelManager.cc

Timestamp:

May 12, 2011, 12:31:23 AM (14 years ago)

Author:

dafrick

Message:

Merging tutoriallevel2 branch into tutoriallevel3 branch.

Location:

code/branches/tutoriallevel3

Files:

code/branches/tutoriallevel3
- Property svn:mergeinfo changed
  /code/branches/tutoriallevel (added) merged: 7828-7831,7894,8370
  /code/branches/tutoriallevel2 (added) merged: 8371,8374,8376-8378,8444-8451

r8079	r8453
222	222	this->nextLevel_ = this->availableLevels_.begin();
223	223	}
	224
224	225	while(this->nextIndex_ != index)
225	226	{

Note: See TracChangeset for help on using the changeset viewer.

/code/branches/tutoriallevel (added)	merged: 7828-7831,7894,8370
/code/branches/tutoriallevel2 (added)	merged: 8371,8374,8376-8378,8444-8451