Context Navigation

overlays

Timestamp:

Feb 20, 2018, 12:14:40 AM (8 years ago)

Author:

landauf

Message:

merged Presentation_HS17_merge back to trunk

Location:

code/trunk

Files:

Property svn:mergeinfo changed

/code/branches/AsteroidMining_HS17 (added)	merged: 11461,11492,11508,11520,11524,11546-11548,11550-11551,11553,11561,11581,11586-11587,11609-11610,11615,11618,11640-11641,11646,11664-11665,11667
/code/branches/Asteroid_HS17 (added)	merged: 11456,11490,11506,11516,11528,11541,11555,11593-11594,11608,11613-11614,11616-11617,11619,11637,11643,11645,11660,11666,11668-11669,11671
/code/branches/CampaignMap_HS17 (added)	merged: 11458,11507,11512-11513,11525-11527,11544-11545,11560,11564,11584,11588,11605,11634,11636,11663,11675-11676
/code/branches/Dialog_HS17 (added)	merged: 11455,11515,11579,11607,11611-11612,11642,11644,11652,11656,11658,11670
/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/Presentation_HS17_merge (added)	merged: 11723-11770,11772-11778,11780-11782
/code/branches/ProtectBoss_HS17 (added)	merged: 11457,11489,11494,11500,11522,11542,11557,11585,11604,11639,11672
/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
/code/branches/Waypoints_HS17 (added)	merged: 11496,11523,11539,11559,11582,11603,11633,11655,11657,11659,11661,11687

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