Context Navigation

CMakeLists.txt

Timestamp:

Dec 16, 2017, 12:24:20 PM (8 years ago)

Author:

patricwi

Message:

merged FlappyOrx and SOBv2

Location:

code/branches/Presentation_HS17

Files:

Property svn:mergeinfo changed

/code/branches/FlappyOrx_HS17 (added)	merged: 11460,11481,11503-11505,11509,11511,11514,11521,11529-11530,11533,11537,11543,11554,11563,11565-11566,11568,11572,11574,11576,11580,11589,11595-11596,11598,11600,11620,11624,11627,11630-11631,11635,11648
/code/branches/SOBv2_HS17 (added)	merged: 11459,11491,11517,11531-11532,11534-11536,11538,11556,11567,11569-11570,11573,11575,11577-11578,11590-11592,11597,11599,11601-11602,11621-11623,11625-11626,11628-11629,11632,11647,11650-11651,11653-11654

r11451	r11678
46	46	ADD_SUBDIRECTORY(hover)
47	47	ADD_SUBDIRECTORY(superorxobros)
	48	ADD_SUBDIRECTORY(flappyorx)

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