Context Navigation

gim_box_set.cpp

Timestamp:

Apr 8, 2009, 12:36:08 AM (16 years ago)

Author:

dafrick

Message:

Merging of the current QuestSystem branch.

Location:

code/branches/questsystem5

Files:

Property svn:mergeinfo changed

/code/branches/gui	merged: 2796,2798-2801,2805,2807-2808,2811,2814-2817,2834,2840-2850,2853-2854,2859,2862-2863,2869,2875,2887,2892
/code/branches/miniprojects (added)	merged: 2755,2768,2789,2806,2818-2821,2824
/code/branches/weaponsystem (added)	merged: 2743,2778,2804,2852,2886

r2662	r2907
111	111	}
112	112
113		bool unbal = (splitIndex==startIndex) \|\| (splitIndex == (endIndex));
114		btAssert(!unbal);
	113	btAssert(!((splitIndex==startIndex) \|\| (splitIndex == (endIndex))));
115	114
116	115	return splitIndex;
…	…
181	180	}
182	181
	182

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