Context Navigation

Tests

Timestamp:

09/14/11 13:59:25 (13 years ago)

Author:

epitzer

Message:

#1530 integrate changes from trunk

Location:

branches/PersistenceSpeedUp

Files:

Property svn:ignore

Property svn:mergeinfo changed

/branches/QAPAlgorithms (added)	merged: 6350-6351,6355,6416,6569-6570,6586,6593-6594,6610-6611,6615-6617,6627
/branches/histogram (added)	merged: 5959,5961,5970,5994-5996,5999,6007,6010-6016,6020,6022,6027-6028,6032,6046,6055-6056,6081-6082,6086-6087,6089,6115,6176,6194-6195,6338-6341
/trunk/sources	merged: 6233-6241,6250,6252,6254-6256,6259,6262,6265,6291,6298,6302,6342,6344,6352-6353,6356,6363,6365,6375-6376,6378,6380,6410-6411,6413,6423-6425,6427-6430,6432,6434,6436,6438-6443,6446-6450,6455,6459-6460,6466-6468,6470-6472,6474,6476-6477,6485,6487-6488,6491,6495-6496,6498-6520,6522-6527,6529,6531-6545,6547-6555,6557-6559,6566-6568,6571-6585,6587-6592,6596-6606,6609,6612-6614,6628-6631,6633-6638,6640-6645,6648-6649,6652-6656,6661-6674,6676-6681,6684,6686-6687,6690-6695,6697,6705,6709,6718-6720,6728-6729,6732,6735,6738-6742,6745-6746,6749-6750,6754-6755,6758

r5446	r6760
32	32	// by using the '*' as shown below:
33	33	[assembly: AssemblyVersion("3.3.0.0")]
34		[assembly: AssemblyFileVersion("3.3.3.0")]
	34	[assembly: AssemblyFileVersion("3.3.5.0")]

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