Context Navigation

Changeset 6038 for sandbox/data

Timestamp:

Nov 5, 2009, 9:22:22 PM (15 years ago)

Author:

rgrieder

Message:

Synchronised sandbox with current code trunk. There should be a few bug fixes.

Location:

sandbox

Files:

Property svn:mergeinfo changed

/code/branches/core5 (added)	merged: 5768-5769,5772,5775-5780,5783-5785,5791-5792,5795-5807,5809-5814,5816-5832,5836-5839,5842-5853,5855-5899,5904-5922,5924-5928
/code/trunk (added)	merged: 5794,5808,5900-5901,5923,5929,5936-5938,5940,5951,5958,5960-5961,5963-5967,5976,5978,5980,5988-5989,6021,6026,6028,6035

r5782	r6038
25	25	#
26	26
27		# For dev runs we've got two data directory. The one from the other repository root folder
	27	# For dev runs we've got two data directories. The one from the other repository root folder
28	28	# is called EXTERNAL_DATA
29	29	SET(DATA_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

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