diff --git a/uppbox/uppweb/www.tpp/Roadmap_en-us.tpp b/uppbox/uppweb/www.tpp/Roadmap_en-us.tpp index 493e24f74..1aa43731f 100644 --- a/uppbox/uppweb/www.tpp/Roadmap_en-us.tpp +++ b/uppbox/uppweb/www.tpp/Roadmap_en-us.tpp @@ -28,8 +28,7 @@ topic "Roadmap"; [s2; Roadmap&] [s24; Current release&] [s3; 2017.2 (rev 11540) (Dec 2017)&] -[s5; U`+`+ now requires C`+`+14 compatible compiler.&] -[s22; Core&] +[s5; Core&] [s5;l160;i150;O0; New AsyncWork class `- U`+`+ future`-alike tool&] [s5;l160;i150;O0; CoWork: Exception propagation from worker threads, job cancellation support.&] diff --git a/uppbox/uppweb/www.tpp/Roadmap_en-us.tppi b/uppbox/uppweb/www.tpp/Roadmap_en-us.tppi index 697605a3c..4507527c8 100644 --- a/uppbox/uppweb/www.tpp/Roadmap_en-us.tppi +++ b/uppbox/uppweb/www.tpp/Roadmap_en-us.tppi @@ -1,32 +1,13 @@ TITLE("Roadmap") COMPRESSED -<<<<<<< .mine -120,156,133,90,11,83,219,72,182,254,43,93,75,238,12,100,140,81,183,158,182,171,182,6,12,78,216,13,73,46,36,51,91,75,49,99,61,218,118,7,89,173,145,100,136,179,117,231,183,223,239,116,203,198,206,8,54,41,136,101,247,121,244,57,223,121,58,183,130,189,122,229,244,156,3,231,191,252,25,158,203,89,188,202,155,187,219,92,68,209,72,113,46,156,81,204,195,209,135,193,232,207,63,255,236,115,207,137,70,196,140,131,25,119,60,151,11,142,247,28,79,132,220,31,56,3,63,226,145,227,134,158,240,67,199,31,150,113,21,47,239,110,227,200,29,189,190,14,64,37,122,254,129,203,93,238,240,64,120,56,229,184,142,240,184,240,121,20,121,60,244,35,119,16,4,195,52,46,27,165,139,187,219,132,232,60,144,185,32,115,194,40,240,56,136,60,95,184,161,239,129,216,243,160,158,11,193,97,16,134,195,70,53,185,188,187,85,164,55,180,29,147,150,94,47,56,128,118,34,4,165,39,188,192,115,35,225,242,72,136,96,224,122,3,15,106,115,49,84,141,132,146,229,130,8,124, -72,242,124,143,187,176,133,23,250,46,14,132,248,215,115,6,92,64,92,228,248,62,36,201,175,27,3,37,48,13,153,135,104,3,8,19,161,79,20,145,23,113,55,140,132,39,2,1,241,78,136,43,146,108,127,152,201,58,5,173,43,248,168,129,66,163,241,207,254,136,131,56,236,133,7,194,25,56,34,8,7,16,10,85,113,91,119,48,224,110,4,161,30,247,29,238,14,83,157,225,134,137,240,29,215,72,140,224,132,0,156,141,65,252,128,67,105,225,70,16,25,114,215,197,111,223,139,194,97,45,201,13,141,174,238,110,95,255,254,243,161,211,119,250,194,247,143,136,126,0,250,200,245,92,215,11,6,30,119,92,200,1,19,143,204,21,56,240,36,247,69,52,76,226,26,66,27,188,21,90,163,114,2,18,204,238,70,190,11,217,1,126,193,165,184,161,11,3,137,129,23,185,110,228,12,211,60,174,235,214,74,100,161,215,116,75,206,123,156,31,132,100,92,223,21,222,128,172,227,10,88,89,4,254,128,195,204,126,224,57,98,88,201,63,86,170,146,75,89,192,206,10,200,24,37,158, -24,197,248,105,97,8,101,44,10,69,143,11,224,208,15,2,135,12,230,3,11,194,245,97,113,135,71,30,52,194,95,120,184,105,129,152,60,221,193,237,113,247,96,32,60,23,154,12,60,15,22,0,3,62,224,156,59,17,254,226,102,176,139,129,6,111,49,213,138,183,228,94,143,123,7,33,16,12,87,13,60,18,63,112,201,126,2,246,23,129,227,195,17,194,146,11,152,253,103,241,10,118,231,34,162,31,99,121,238,247,56,66,1,42,114,223,199,189,93,152,90,68,184,187,15,219,187,6,221,60,140,134,239,229,99,125,30,55,178,69,204,235,241,43,11,53,30,244,120,112,224,16,189,31,13,224,64,238,145,253,92,207,27,136,129,235,250,98,224,187,129,3,59,214,54,150,137,152,162,201,68,226,150,73,216,227,33,226,10,119,245,125,220,222,144,225,230,33,39,85,68,52,8,200,10,45,147,233,113,174,10,210,3,200,24,89,48,188,30,255,196,121,72,140,34,68,77,20,5,142,59,128,49,96,3,199,7,212,145,11,34,56,26,126,22,136,3,74,6,233,125,60,151,211,227,54, -80,141,10,132,64,223,245,35,2,46,40,161,58,148,0,159,129,227,4,120,39,138,16,78,195,121,92,238,1,80,56,61,225,0,69,72,61,62,162,18,178,0,63,103,64,105,4,73,1,30,64,22,26,248,22,129,211,227,66,214,141,204,224,124,223,49,215,22,188,39,56,108,7,252,249,126,228,121,1,244,133,236,144,178,18,185,16,17,236,135,238,240,99,92,17,96,132,63,138,201,242,134,82,244,132,56,8,197,169,31,158,135,103,46,114,17,224,78,233,196,153,156,157,9,126,134,88,8,125,103,88,175,146,246,138,57,32,179,65,110,185,248,208,202,119,123,194,61,240,196,56,186,56,247,163,83,62,185,240,39,167,103,206,100,124,113,10,164,123,193,217,100,226,195,119,165,86,132,126,147,3,127,55,116,94,79,120,7,19,207,155,4,193,197,169,115,118,46,194,113,192,47,78,199,167,227,51,113,14,102,81,116,138,156,91,201,92,154,136,253,207,239,255,247,63,23,239,143,63,223,176,219,90,140,216,181,142,179,101,92,254,112,135,39,15,143,246,24,75,227,34,83,25,32,70,31, -184,35,70,184,235,11,118,88,201,7,198,41,34,143,216,225,185,76,205,251,71,116,198,31,177,207,211,159,166,63,177,66,63,178,54,80,107,54,166,183,184,199,82,189,44,227,70,37,185,52,47,85,46,171,190,17,9,13,198,186,146,150,131,1,145,66,78,27,193,38,12,32,103,167,245,186,72,127,213,213,61,51,94,99,211,227,86,202,108,213,172,42,128,38,206,213,189,100,141,214,121,23,139,177,38,218,33,187,248,154,74,83,60,88,89,233,50,158,199,230,245,172,210,75,246,136,3,178,98,205,162,146,113,86,247,216,23,157,208,229,83,153,231,246,84,189,42,75,93,53,253,46,254,103,170,169,91,205,52,248,47,213,55,153,245,152,106,152,170,141,29,74,93,215,230,210,141,102,181,108,216,18,17,163,74,60,39,68,120,152,234,85,209,48,147,132,100,35,171,163,46,17,191,202,228,70,167,247,32,174,80,130,83,228,107,153,177,153,174,88,76,166,89,84,186,208,43,146,46,43,163,110,23,139,207,159,38,211,99,87,108,110,2,219,21,41,157,197,109,63,23,138,138,199,24,62, -209,240,58,156,190,121,11,206,109,223,220,57,190,229,0,249,224,202,3,188,83,85,26,246,148,184,134,170,234,46,241,231,128,84,35,39,58,207,100,117,46,101,105,44,147,153,55,107,86,175,151,72,32,247,157,132,87,241,189,252,80,60,41,192,14,227,28,102,42,112,209,7,99,82,124,56,29,14,199,240,92,35,59,141,247,14,224,158,192,203,19,0,174,199,110,200,120,159,52,61,16,144,46,30,80,71,216,67,92,169,184,104,186,168,175,229,131,172,106,121,29,23,115,107,154,27,220,93,102,230,185,235,252,141,172,64,192,222,195,155,236,18,225,147,82,117,221,218,76,21,172,117,36,177,122,219,52,229,53,162,4,73,168,147,213,205,59,222,231,236,244,227,229,134,190,91,193,185,66,18,171,222,228,58,137,115,136,87,8,135,111,173,110,108,19,95,111,62,95,18,236,231,64,217,82,21,243,46,70,167,85,21,175,199,77,149,15,217,229,18,103,31,76,141,173,73,231,26,178,65,213,99,5,194,177,92,37,185,74,217,27,217,140,17,31,215,50,109,122,187,15,87,230,233,70,230, -255,148,107,160,229,70,54,215,250,241,92,213,101,30,175,205,227,88,231,171,101,177,125,231,52,165,176,196,25,6,252,47,116,214,137,130,179,85,211,192,247,239,1,134,236,166,89,195,119,53,253,238,140,199,95,85,179,56,71,132,143,23,90,165,114,72,34,79,174,229,18,247,97,184,79,181,166,11,101,248,124,122,156,233,199,130,229,170,219,250,159,208,200,145,53,0,46,66,208,78,228,245,12,120,145,31,88,2,212,221,51,248,123,205,114,93,204,217,225,223,249,213,217,17,163,106,216,121,141,79,149,148,214,194,48,209,135,82,22,151,148,109,218,23,93,4,151,25,29,39,51,254,145,155,87,123,106,40,235,166,172,139,242,131,73,117,195,214,224,186,234,58,115,145,169,166,223,239,223,148,10,7,175,145,135,76,156,92,193,62,75,157,169,153,2,142,173,79,186,211,42,184,126,212,229,202,198,242,34,174,89,98,189,132,160,132,161,77,62,165,76,159,155,60,197,168,49,126,46,195,207,16,188,43,42,21,20,31,136,24,16,159,87,241,99,111,243,64,87,239,162,125,139,116,13,57, -39,108,162,53,9,36,159,144,50,9,228,46,40,66,51,182,170,1,92,147,94,129,253,114,97,114,191,4,154,187,29,244,191,159,38,45,48,13,31,53,47,52,169,69,186,183,55,57,1,47,48,96,106,102,33,104,179,124,131,159,106,25,231,155,112,251,180,144,151,231,23,27,9,3,177,227,209,214,103,72,126,201,106,62,39,229,244,12,188,139,90,131,89,92,150,57,165,12,202,180,236,17,64,102,240,198,155,95,187,24,93,197,105,165,175,226,2,109,83,213,245,249,197,87,98,133,50,244,70,147,71,8,147,253,254,83,141,96,135,176,117,156,1,1,202,186,236,125,252,160,230,148,172,142,186,184,157,93,143,141,69,218,68,84,179,119,255,246,122,248,117,117,106,50,217,191,235,38,51,69,29,214,170,119,42,208,46,11,147,114,77,15,80,169,218,200,212,249,95,32,188,75,112,142,238,129,160,190,222,165,218,132,94,189,208,143,39,51,69,181,128,178,210,73,139,216,236,164,50,161,142,242,8,113,117,39,219,24,157,4,160,137,4,189,80,243,69,142,159,102,39,37,238,29,93,89, -119,80,97,51,13,234,182,12,117,95,176,200,78,243,124,19,6,170,104,65,129,24,140,171,116,193,14,103,56,80,179,24,71,116,154,2,239,104,48,12,228,241,186,162,50,68,42,119,90,255,173,252,250,139,66,156,216,182,106,41,151,9,106,18,53,22,234,57,93,144,127,165,173,151,38,79,1,166,20,145,112,15,106,23,69,163,68,197,174,246,114,223,46,181,241,52,12,92,155,16,46,86,36,143,96,90,27,174,224,128,232,170,144,134,100,213,105,225,38,78,88,141,26,180,223,254,80,227,37,171,233,49,221,146,97,112,84,157,180,215,210,92,139,188,190,233,109,136,211,247,217,119,139,195,68,35,72,234,135,194,192,112,174,58,175,243,46,94,235,21,170,188,170,231,178,216,64,206,20,183,78,237,23,82,101,114,95,202,47,170,94,145,35,155,85,166,180,233,119,109,87,187,109,100,89,188,178,237,221,170,236,12,214,27,160,66,229,153,1,125,109,14,111,207,82,190,112,171,140,114,84,179,166,204,187,122,6,184,38,21,176,192,99,171,146,154,114,98,198,222,140,199,211,99,52,229, -125,167,139,130,42,11,186,8,211,170,253,98,21,222,161,229,52,237,231,93,116,101,190,66,102,58,201,191,121,67,134,95,251,68,97,223,125,129,38,249,38,134,223,11,9,94,56,255,165,156,239,157,167,110,139,96,59,72,94,32,42,211,74,238,81,69,152,250,95,58,95,204,191,83,74,244,253,240,5,130,250,143,28,243,185,187,71,228,246,49,253,12,94,32,250,54,100,159,247,101,240,151,148,186,80,64,227,30,201,230,238,110,223,237,123,187,13,28,102,178,113,155,35,218,17,110,119,34,227,237,68,230,68,142,135,137,236,31,8,248,221,137,236,211,2,37,74,217,80,158,161,61,223,242,160,136,182,131,84,179,136,27,118,251,250,100,59,179,221,181,67,27,239,28,218,168,188,177,101,140,204,53,211,41,6,143,71,36,148,219,215,102,134,187,235,153,162,130,170,182,140,139,53,250,128,5,141,81,182,145,68,226,211,143,184,105,178,222,114,167,160,221,148,0,83,164,243,92,230,187,141,234,118,242,194,12,4,214,121,173,25,70,210,98,250,163,153,63,230,212,72,39,20,219,167,5, -90,58,149,25,134,143,72,215,166,73,55,26,33,201,37,85,140,116,66,37,135,238,137,234,222,128,118,249,95,103,207,15,149,130,159,16,246,214,72,99,40,151,160,12,224,34,224,154,73,36,211,212,120,142,100,86,18,108,83,60,152,162,61,217,12,43,230,41,145,212,195,176,60,94,38,89,252,242,40,41,13,48,192,175,237,133,141,40,155,245,11,76,20,25,218,143,29,193,228,128,248,65,155,212,124,88,55,208,35,174,178,35,200,35,46,178,200,58,101,216,203,196,249,92,87,80,110,217,206,168,149,90,162,192,230,107,51,10,147,169,110,1,6,234,160,106,120,52,145,53,50,98,77,93,74,3,175,227,46,55,171,196,76,64,61,24,175,168,155,167,233,136,202,84,251,212,106,78,206,5,117,183,50,151,5,42,24,44,92,81,243,73,215,104,39,232,182,3,162,188,117,122,125,197,168,124,34,30,83,106,18,95,188,84,174,237,188,181,29,196,113,149,20,186,204,161,118,15,61,122,122,79,152,82,212,70,103,171,212,154,208,84,198,233,177,29,254,97,222,150,139,29,118,159,88,90, -47,64,3,232,149,16,39,2,244,99,188,174,25,38,224,100,77,115,44,6,175,121,1,166,135,53,48,157,83,59,82,99,136,187,16,140,102,233,163,78,197,223,72,152,19,6,72,17,145,5,90,233,109,72,62,57,168,103,148,133,111,17,253,59,110,107,251,28,59,147,141,205,18,129,28,96,94,93,206,118,78,118,218,253,187,1,143,66,224,228,250,227,248,249,253,9,198,32,244,55,239,112,239,93,175,214,108,250,227,12,67,141,233,97,209,19,204,229,244,71,182,92,161,95,102,136,52,202,56,210,250,181,221,176,124,209,73,221,105,7,43,68,86,215,178,214,171,138,250,34,187,81,249,78,22,117,222,123,203,26,136,35,84,162,63,127,134,237,71,84,85,219,227,110,45,130,153,64,206,86,185,65,87,185,249,152,112,17,211,4,188,121,251,47,169,168,123,216,92,72,224,28,93,246,18,163,105,141,6,160,168,17,20,157,49,182,136,31,228,19,227,118,229,208,201,244,166,169,72,157,217,170,130,5,171,221,173,18,249,250,19,98,245,93,92,99,234,166,87,55,13,110,96,95,34,111, -244,108,19,58,3,162,123,155,213,197,246,157,46,81,19,48,26,183,125,59,59,108,27,81,164,1,59,54,161,201,63,50,246,48,49,66,169,176,181,199,110,175,255,140,225,43,185,105,61,219,186,65,177,184,151,167,151,241,23,155,187,182,227,31,229,140,39,29,108,18,239,100,255,245,235,219,184,94,208,2,103,134,11,192,188,197,244,56,173,214,101,163,205,148,167,82,154,71,205,231,6,64,48,17,201,33,165,186,13,254,246,84,248,129,9,211,61,2,2,240,179,68,59,189,200,110,155,64,52,168,48,18,106,153,143,218,162,254,18,139,111,52,61,237,33,253,246,183,69,211,148,211,225,244,100,122,130,198,87,38,90,223,79,251,104,111,23,171,100,218,87,122,106,104,166,39,191,49,250,247,110,215,29,236,208,20,29,179,101,180,49,66,150,55,219,128,238,20,244,212,236,109,135,171,61,226,109,157,252,110,135,196,166,63,176,214,218,157,57,230,99,54,163,33,222,184,250,90,165,11,90,168,236,118,213,236,227,249,4,99,194,188,176,206,239,212,109,143,142,52,179,99,61,91,152,193, -255,100,102,199,126,186,48,45,117,208,140,80,70,235,228,180,221,110,177,57,166,245,27,217,188,67,33,27,219,229,4,20,220,89,96,109,106,239,246,222,251,195,252,62,202,151,54,133,110,23,66,146,213,37,248,64,79,153,222,183,189,65,99,115,4,213,79,115,156,50,24,26,5,152,174,109,29,168,27,137,155,198,236,2,54,243,121,231,37,204,174,100,179,137,69,47,160,104,111,96,187,154,218,206,152,132,190,71,153,176,195,60,198,57,251,156,84,152,228,100,101,35,217,172,50,182,115,28,222,216,12,159,192,93,209,152,165,79,167,104,218,39,209,44,107,131,217,174,16,150,20,47,106,91,138,104,174,132,66,51,147,59,118,55,224,109,157,148,202,164,51,179,248,32,201,155,54,148,216,244,246,158,96,71,50,6,49,83,243,213,102,217,13,203,62,147,14,144,133,139,205,146,128,18,39,141,254,61,52,138,179,153,108,167,236,22,34,164,89,46,237,130,110,219,161,208,164,219,109,239,43,141,40,182,201,28,81,73,197,189,170,247,32,156,85,241,124,250,3,109,19,41,244,43,137,150, -52,54,243,42,77,214,221,144,166,116,108,119,33,143,120,5,94,212,61,195,130,49,45,113,159,185,31,249,61,67,159,164,231,198,16,41,45,187,237,90,171,221,74,168,103,118,161,219,116,251,180,87,218,224,52,51,219,21,164,217,22,41,248,68,34,238,77,175,99,190,20,177,176,239,206,238,121,108,219,40,187,197,55,255,43,224,105,20,38,21,219,253,124,135,252,103,234,127,251,29,209,119,60,55,77,173,253,178,3,113,181,97,104,166,233,110,86,191,0,4,244,117,72,188,123,148,54,118,59,61,207,54,182,47,110,58,123,30,50,56,66,114,177,19,109,230,59,166,154,218,200,84,3,92,13,16,94,66,83,217,164,207,186,172,29,10,204,6,125,83,210,45,187,167,156,106,251,191,206,162,4,188,33,30,225,46,242,210,118,74,162,136,198,203,148,10,54,74,148,185,29,177,182,238,178,223,222,92,253,211,186,16,189,65,66,86,59,252,248,225,230,242,95,232,197,30,84,165,11,178,192,81,159,146,215,54,146,117,241,244,181,84,106,86,158,170,126,218,220,152,130,50,253,219,244,248, -203,244,111,109,41,233,188,243,121,155,128,45,207,191,216,251,175,75,125,10,213,175,118,7,246,176,241,26,176,109,143,59,118,248,117,71,111,61,74,223,152,0,30,104,82,176,105,162,30,182,211,45,90,221,181,94,153,88,206,81,36,141,145,77,195,98,147,170,113,157,29,17,227,239,89,80,123,64,180,20,16,180,154,51,75,65,59,38,34,164,52,77,171,196,238,246,183,70,151,42,181,197,24,113,143,244,58,61,121,124,124,156,158,180,95,155,190,69,172,163,209,75,227,124,250,74,162,17,89,213,191,1,40,141,188,235,223,221,253,63,155,84,64,48, -======= -120,156,133,87,139,110,219,70,22,253,149,1,156,93,56,169,44,115,94,124,72,192,162,178,100,37,198,198,73,215,78,26,160,134,91,81,228,88,154,154,226,48,36,101,199,89,108,191,125,207,29,81,174,157,101,179,54,244,32,53,247,117,238,185,103,134,87,130,189,120,17,12,130,131,224,255,252,141,102,230,38,221,22,237,245,85,33,226,120,108,57,23,193,56,229,209,248,125,50,254,227,143,63,134,92,5,241,152,156,113,56,227,129,146,92,112,220,11,148,136,184,78,130,68,199,60,14,100,164,132,142,2,61,170,210,58,221,92,95,165,177,28,191,186,8,97,37,6,250,64,114,201,3,30,10,133,85,129,12,132,226,66,243,56,86,60,210,177,76,194,112,148,165,85,107,93,121,125,181,36,59,5,51,9,179,32,138,67,197,97,164,180,144,145,86,48,86,10,233,73,4,142,194,40,26,181,182,45,204,245,149,165,188,145,237,148,178,84,131,240,0,217,137,8,150,74,168,80,201,88,72,30,11,17,38,82,37,10,105,115,49,178,173,65,146,213,154,12,52,34,41,173,184,4,22,42, -210,18,11,34,124,170,32,225,2,225,226,64,107,68,50,95,246,0,45,1,13,193,67,182,33,130,137,72,147,69,172,98,46,163,88,40,17,10,132,15,34,148,72,177,245,40,55,77,6,91,41,248,184,69,66,227,233,143,122,204,97,28,13,162,3,17,36,129,8,163,4,65,145,42,170,149,73,194,101,140,160,138,235,128,203,81,230,114,84,184,20,58,144,62,98,140,38,132,240,236,1,209,33,71,210,66,198,8,25,113,41,241,174,85,28,141,26,67,109,104,93,125,125,245,234,183,31,15,131,97,48,20,90,191,36,251,4,246,177,84,82,170,48,81,60,144,136,3,39,138,224,10,3,116,146,107,17,143,150,105,131,160,45,110,69,59,80,57,17,9,176,203,88,75,196,14,241,134,150,162,66,9,128,68,162,98,41,227,96,148,21,105,211,116,40,17,66,175,168,74,206,7,156,31,68,4,174,150,66,37,132,142,20,64,89,132,58,225,128,89,135,42,16,163,218,124,222,218,218,108,76,9,156,45,152,49,94,42,49,78,241,234,104,136,100,118,44,20,3,46,192,67,29,134,1,1, -166,193,5,33,53,16,15,120,172,144,17,254,209,225,182,35,226,242,207,26,228,128,203,131,68,40,137,76,18,165,128,0,28,240,132,115,30,196,248,71,101,192,197,83,131,119,156,234,194,239,204,213,128,171,131,8,12,70,171,18,69,225,19,73,248,9,224,47,194,64,163,17,98,103,46,0,251,143,226,5,112,231,34,166,151,71,158,235,1,199,40,32,69,174,53,234,150,128,90,196,168,93,3,123,233,217,205,163,120,244,206,220,55,179,180,53,29,99,94,77,95,236,168,198,195,1,15,15,2,178,215,113,130,6,114,69,248,73,165,18,145,72,169,69,162,101,24,0,199,102,55,203,100,76,211,228,39,241,209,73,52,224,17,230,10,181,106,141,234,189,25,42,143,56,165,34,226,36,36,20,58,39,139,163,194,150,148,7,152,49,222,145,225,213,244,7,206,35,114,20,99,106,226,56,12,100,2,48,128,65,160,65,117,104,65,140,70,163,207,2,115,64,98,144,221,166,43,179,56,234,6,213,167,64,12,212,82,199,68,92,88,34,117,36,1,63,73,16,132,184,19,199,24,167,209,42, -173,158,17,80,4,3,17,128,69,144,30,141,169,68,44,208,47,72,72,70,32,10,232,0,84,40,209,59,6,46,142,74,211,180,38,71,243,117,224,203,22,124,32,56,176,3,255,180,142,149,10,145,47,98,71,164,74,212,66,76,176,142,228,232,167,180,38,194,8,61,78,9,121,111,41,6,66,28,68,98,162,163,89,116,34,161,69,160,59,201,73,48,63,57,17,252,4,179,16,233,96,212,108,151,93,137,5,40,179,103,110,181,126,223,197,151,3,33,15,148,152,198,167,51,29,79,248,252,84,207,39,39,193,124,122,58,1,211,85,120,50,159,107,244,174,114,150,216,239,53,240,55,111,167,6,66,29,204,149,154,135,225,233,36,56,153,137,104,26,242,211,201,116,50,61,17,51,56,139,227,9,52,183,54,133,241,19,251,239,223,254,243,183,211,119,71,31,47,217,85,35,198,236,194,165,249,38,173,254,126,141,43,53,102,211,109,93,99,188,88,183,156,110,203,49,35,214,13,5,59,172,205,29,227,52,143,47,217,225,12,223,233,254,75,90,163,199,236,227,226,135,197,15,172,116,247, -172,27,211,134,77,233,22,87,44,115,155,42,109,237,178,48,254,171,45,76,61,244,1,17,127,234,106,179,243,224,41,100,161,104,99,32,194,64,113,54,105,30,202,236,147,171,111,153,239,25,91,28,117,81,110,182,237,182,6,101,210,194,222,26,214,58,87,244,185,152,58,178,29,177,211,47,153,241,91,7,171,106,87,165,171,212,127,191,169,221,134,221,99,129,169,89,187,174,77,154,55,3,246,187,91,178,44,45,51,83,20,187,85,205,182,170,92,221,14,251,252,159,216,182,233,50,115,240,191,177,95,77,62,96,182,101,182,241,56,84,174,105,124,209,173,99,141,105,217,6,243,98,43,92,47,201,240,48,115,91,0,237,37,200,180,166,126,217,23,226,147,89,94,186,236,214,80,67,110,210,12,106,109,114,118,227,106,150,18,52,235,218,149,110,75,209,77,237,211,237,115,241,241,195,124,113,36,197,190,18,96,87,102,180,22,213,126,44,45,109,29,83,244,196,53,134,165,101,190,191,53,51,89,119,243,201,242,71,15,136,15,175,60,196,157,186,118,192,211,160,12,91,55,125,225,103, -32,82,107,230,174,200,77,61,51,166,242,200,228,254,102,195,154,135,13,228,227,182,215,240,60,189,53,239,203,63,19,96,135,105,1,152,74,20,122,231,33,197,143,139,209,104,138,206,181,166,23,188,183,160,246,28,93,158,131,112,3,118,73,224,125,112,116,65,68,58,189,35,154,223,165,181,77,203,182,207,250,194,220,153,186,49,23,105,185,218,65,115,137,218,77,238,175,251,214,95,154,26,6,236,29,186,201,206,202,220,102,180,183,62,98,102,75,214,53,146,92,189,105,219,234,2,83,2,9,234,117,117,249,150,15,57,155,252,116,182,183,239,79,112,101,33,97,245,235,194,45,211,2,225,45,198,225,107,151,27,219,207,215,235,143,103,68,251,21,88,182,177,229,170,207,209,164,174,211,135,105,91,23,35,118,182,193,218,59,191,195,54,148,115,131,216,176,26,176,18,227,88,109,151,133,205,216,107,211,78,49,31,23,38,107,7,79,47,206,253,213,165,41,254,105,30,192,150,75,211,94,184,251,153,109,170,34,125,240,151,83,87,108,55,229,227,157,73,70,99,137,53,12,252,95,187, -188,151,5,39,219,182,69,239,223,129,12,249,101,251,128,222,53,244,222,59,143,159,108,187,158,97,194,167,107,103,51,51,162,144,199,23,102,131,122,24,234,169,31,168,160,28,191,47,142,114,119,95,178,194,246,163,255,1,199,56,66,3,228,34,6,61,153,188,129,39,47,244,129,45,193,186,91,134,126,63,176,194,149,43,118,248,15,126,126,242,146,209,94,216,91,198,135,218,152,29,194,128,232,125,101,202,51,82,155,238,75,159,193,89,78,203,9,198,207,133,255,246,44,13,187,107,83,222,103,249,222,75,221,168,3,220,213,125,107,78,115,219,14,135,195,203,202,98,225,5,116,200,207,201,57,240,217,184,220,222,88,240,120,215,147,126,89,133,215,159,92,181,221,205,242,58,109,216,114,215,37,12,37,128,246,122,74,74,95,120,157,98,116,44,254,43,133,191,193,240,110,105,171,160,249,192,196,192,120,86,167,247,131,253,5,149,222,103,251,6,114,141,56,199,108,238,28,5,164,158,80,50,75,196,93,211,132,230,108,219,128,184,94,94,193,253,106,237,181,223,128,205,253,13,250,215, -135,121,71,76,239,199,174,74,71,105,81,238,93,37,199,240,5,7,204,222,236,40,184,83,249,22,175,122,147,22,251,113,251,176,54,103,179,211,125,132,68,60,233,104,215,51,136,223,114,187,90,81,114,238,6,190,203,198,193,89,90,85,5,73,6,41,45,187,7,145,25,186,241,250,83,159,163,243,52,171,221,121,90,226,208,84,247,253,126,250,133,92,97,27,122,237,168,35,196,201,225,240,207,61,130,29,2,235,52,7,3,236,174,101,239,210,59,187,34,177,122,217,231,237,228,98,234,17,233,132,168,97,111,127,81,3,188,157,79,188,146,253,210,180,185,223,212,129,86,243,100,7,122,234,194,75,174,63,3,212,182,241,49,93,241,63,20,126,106,48,195,233,129,168,254,240,212,106,63,122,205,218,221,31,223,88,218,11,72,149,142,59,198,230,199,181,31,117,108,143,8,215,244,186,77,113,146,0,53,33,208,107,187,90,23,120,181,79,36,241,217,210,237,174,29,180,177,249,227,233,227,54,212,95,96,153,79,138,98,63,6,182,236,72,129,25,76,235,108,205,14,111,176,160,97,41, -150,184,44,3,223,113,192,240,148,207,186,211,22,165,220,139,254,27,243,229,103,139,57,217,29,171,54,102,179,196,158,68,7,11,251,87,185,64,127,205,110,191,244,58,5,154,210,68,162,61,216,187,104,26,13,118,236,250,153,246,61,181,246,157,6,192,141,31,225,114,75,241,136,166,141,247,10,15,152,174,26,50,100,234,94,132,219,116,201,26,236,65,207,143,63,116,240,50,245,226,136,170,100,120,108,180,189,182,23,198,151,69,93,223,159,109,200,211,183,234,251,200,195,165,195,144,52,119,165,167,225,202,246,150,243,54,125,112,91,236,242,182,89,153,114,79,57,191,185,245,102,191,54,54,55,207,163,252,108,155,45,53,178,221,230,214,249,243,238,238,84,251,120,144,101,233,118,119,188,219,86,189,195,122,9,86,216,34,247,164,111,252,226,199,181,164,23,178,206,73,163,218,7,82,222,237,95,16,215,75,1,11,21,219,86,121,74,93,64,196,215,211,233,226,8,135,242,97,208,103,65,59,11,78,17,254,168,246,243,46,225,39,182,156,158,245,139,62,187,170,216,66,153,142,139,175, -106,196,240,246,220,40,26,202,239,216,44,191,138,209,183,65,194,239,172,255,189,90,61,91,79,167,45,162,109,178,252,142,81,149,213,230,153,85,140,103,254,239,173,47,87,223,36,37,134,58,250,142,65,243,185,192,211,185,124,102,36,135,120,250,73,190,99,244,117,196,62,62,143,193,191,151,212,169,5,27,159,153,236,107,151,67,57,84,79,14,112,193,238,67,142,223,40,58,166,101,107,123,7,50,118,207,102,205,168,91,121,118,195,64,115,150,214,6,135,17,119,75,59,11,245,221,150,55,164,66,187,45,37,93,210,32,164,223,186,160,147,48,217,146,86,144,72,121,121,164,129,165,241,191,113,69,225,238,201,221,213,175,173,171,108,182,24,45,142,23,199,24,141,123,179,92,28,223,223,223,47,142,187,199,199,55,208,19,87,67,49,139,197,11,83,46,142,182,205,175,16,130,214,92,15,175,175,255,11,34,154,42,43, ->>>>>>> .r11572 +120,156,133,87,139,110,219,70,22,253,149,1,156,93,56,169,44,115,94,124,72,192,162,178,100,37,198,198,73,215,78,26,160,134,91,81,228,72,154,154,226,48,36,101,199,89,108,191,125,207,29,209,174,157,101,179,54,244,32,53,247,117,238,185,103,134,87,130,189,120,17,12,130,131,224,255,252,141,102,102,149,238,138,246,250,170,16,113,60,182,156,139,96,156,242,104,252,62,25,255,241,199,31,67,174,130,120,76,206,56,156,241,64,73,46,56,238,5,74,68,92,39,65,162,99,30,7,50,82,66,71,129,30,85,105,157,110,175,175,210,88,142,95,93,132,176,18,3,125,32,185,228,1,15,133,194,170,64,6,66,113,161,121,28,43,30,233,88,38,97,56,202,210,170,181,174,188,190,90,146,157,130,153,132,89,16,197,161,226,48,82,90,200,72,43,24,43,133,244,36,2,71,97,20,141,90,219,22,230,250,202,82,222,200,118,74,89,170,65,120,128,236,68,4,75,37,84,168,100,44,36,143,133,8,19,169,18,133,180,185,24,217,214,32,201,106,67,6,26,145,148,86,92,2,11,21, +105,137,5,17,62,85,144,112,129,112,113,160,53,34,153,47,15,0,45,1,13,193,67,182,33,130,137,72,147,69,172,98,46,163,88,40,17,10,132,15,34,148,72,177,245,40,55,77,6,91,41,248,184,69,66,227,233,143,122,204,97,28,13,162,3,17,36,129,8,163,4,65,145,42,170,149,73,194,101,140,160,138,235,128,203,81,230,114,84,184,20,58,144,62,98,140,38,132,240,236,1,209,33,71,210,66,198,8,25,113,41,241,174,85,28,141,26,67,109,104,93,125,125,245,234,183,31,15,131,97,48,20,90,191,36,251,4,246,177,84,82,170,48,81,60,144,136,3,39,138,224,10,3,116,146,107,17,143,150,105,131,160,45,110,69,123,80,57,17,9,176,203,88,75,196,14,241,134,150,162,66,9,128,68,162,98,41,227,96,148,21,105,211,116,40,17,66,175,168,74,206,7,156,31,68,4,174,150,66,37,132,142,20,64,89,132,58,225,128,89,135,42,16,163,218,124,222,217,218,108,77,9,156,45,152,49,94,42,49,78,241,234,104,136,100,246,44,20,3,46,192,67,29,134,1,1, +166,193,5,33,53,16,15,120,172,144,17,254,209,225,182,35,226,242,207,26,228,128,203,131,68,40,137,76,18,165,128,0,28,240,132,115,30,196,248,71,101,192,197,83,131,119,156,234,194,239,205,213,128,171,131,8,12,70,171,18,69,225,19,73,248,9,224,47,194,64,163,17,98,111,46,0,251,143,226,5,112,231,34,166,151,71,158,235,1,199,40,32,69,174,53,234,150,128,90,196,168,93,3,123,233,217,205,163,120,244,206,220,53,179,180,53,29,99,94,77,95,236,169,198,195,1,15,15,2,178,215,113,130,6,114,69,248,73,165,18,145,72,169,69,162,101,24,0,199,102,63,203,100,76,211,228,39,241,209,73,52,224,17,230,10,181,106,141,234,189,25,42,143,56,165,34,226,36,36,20,58,39,139,163,194,150,148,7,152,49,222,147,225,213,244,7,206,35,114,20,99,106,226,56,12,100,2,48,128,65,160,65,117,104,65,140,70,163,207,2,115,64,98,144,221,164,107,179,56,234,6,213,167,64,12,212,82,199,68,92,88,34,117,36,1,63,73,16,132,184,19,199,24,167,209,58, +173,158,17,80,4,3,17,128,69,144,30,141,169,68,44,208,47,72,72,70,32,10,232,0,84,40,209,123,6,46,142,74,211,180,38,71,243,117,224,203,22,124,32,56,176,3,255,180,142,149,10,145,47,98,71,164,74,212,66,76,176,142,228,232,167,180,38,194,8,61,78,9,121,111,41,6,66,28,68,98,162,163,89,116,34,161,69,160,59,201,73,48,63,57,17,252,4,179,16,233,96,212,236,150,93,137,5,40,243,192,220,106,243,190,139,47,7,66,30,40,49,141,79,103,58,158,240,249,169,158,79,78,130,249,244,116,2,166,171,240,100,62,215,232,93,229,44,177,223,107,224,111,222,78,13,132,58,152,43,53,15,195,211,73,112,50,19,209,52,228,167,147,233,100,122,34,102,112,22,199,19,104,110,109,10,227,39,246,223,191,253,231,111,167,239,142,62,94,178,171,70,140,217,133,75,243,109,90,253,253,26,87,106,204,166,187,186,198,120,177,110,57,221,150,99,70,172,27,10,118,88,155,91,198,105,30,95,178,195,153,201,252,253,151,180,70,195,210,213,102,255,213,115,193,66,154, +198,40,141,129,171,108,210,220,151,217,39,87,223,48,15,62,91,28,177,143,139,31,22,63,176,213,174,221,213,232,125,90,216,27,195,90,231,138,62,23,83,71,182,35,118,250,37,51,126,15,96,85,237,170,116,157,250,239,171,218,109,217,29,22,152,154,181,155,218,164,121,51,96,191,187,37,203,210,50,51,69,177,95,213,236,170,202,213,237,176,207,255,137,109,155,46,51,7,255,91,251,213,228,3,102,91,102,27,86,186,59,86,185,166,177,203,130,18,100,141,105,217,22,196,183,21,174,151,100,120,152,185,29,16,243,90,98,90,83,191,236,11,241,201,44,47,93,118,99,8,217,85,154,65,118,77,206,86,174,102,41,65,179,169,93,233,118,20,221,212,62,221,62,23,31,63,204,23,71,82,60,84,2,236,202,140,214,162,218,143,165,165,61,96,234,182,72,213,176,180,204,31,110,161,75,221,205,39,203,31,61,32,62,188,242,16,119,234,218,1,79,131,50,108,221,244,133,159,129,17,173,153,187,34,55,245,204,152,202,35,147,251,155,13,107,238,183,208,129,155,94,195,243,244,198,188, +47,255,76,128,29,166,5,96,42,81,232,173,135,20,63,46,70,163,41,58,215,154,94,240,222,130,163,115,116,121,110,11,51,96,151,4,222,7,71,23,68,164,211,91,226,235,109,90,219,180,108,251,172,47,204,173,169,27,115,145,150,235,61,52,151,168,221,228,254,186,111,253,165,169,97,192,222,161,155,236,172,204,109,70,155,228,35,102,182,100,93,35,201,213,155,182,173,46,176,43,65,75,122,93,93,190,229,67,206,38,63,157,61,216,247,39,184,182,208,162,250,117,225,150,105,129,240,22,227,240,181,203,141,249,201,196,160,190,254,120,70,180,95,131,101,91,91,174,251,28,77,234,58,189,159,182,117,49,98,103,91,172,189,245,91,101,67,57,55,136,13,171,1,43,49,142,213,110,89,216,140,189,54,237,20,243,113,97,178,118,240,244,226,220,95,93,154,226,159,230,30,108,185,52,237,133,187,155,217,166,42,210,123,127,57,117,197,110,91,62,222,153,100,52,150,88,195,192,255,141,203,123,89,112,178,107,91,244,254,29,200,144,95,182,247,232,93,67,239,189,243,248,201,182,155,25, +38,124,186,113,54,51,35,10,121,124,97,182,168,135,161,158,250,158,10,202,241,251,226,40,119,119,37,43,108,63,250,31,112,30,35,52,64,46,98,208,147,201,27,120,242,66,31,216,18,172,187,97,232,247,61,43,92,185,102,135,255,224,231,39,47,25,109,106,189,101,124,168,141,217,35,12,136,222,87,166,60,35,181,233,190,244,25,156,229,180,156,96,252,92,248,111,207,210,176,251,54,229,125,150,239,189,212,141,58,192,93,221,183,230,52,183,237,112,56,188,172,44,22,94,64,135,252,156,156,3,159,173,203,237,202,130,199,251,158,244,203,42,188,254,228,170,221,126,150,55,105,195,150,251,46,97,40,1,180,215,83,195,50,90,6,157,98,116,190,253,43,133,95,97,120,161,228,158,107,151,152,24,24,207,234,244,110,240,112,65,165,247,217,190,129,92,35,206,49,155,59,71,1,169,39,148,204,18,113,55,52,161,57,219,53,32,174,151,87,112,191,218,120,237,55,96,115,127,131,254,245,97,222,17,211,251,177,235,210,81,90,148,123,87,201,49,124,193,1,179,171,61,5,247,42,223, +226,85,111,211,226,97,220,62,108,204,217,236,244,33,66,34,158,116,180,235,25,196,111,185,91,175,41,57,183,130,239,178,113,112,150,86,85,65,146,65,74,203,238,64,100,134,110,188,254,212,231,232,60,205,106,119,158,150,56,253,212,125,191,159,126,33,87,216,134,94,59,234,8,113,114,56,252,115,143,96,135,192,58,205,193,0,187,111,217,187,244,214,174,73,172,94,246,121,59,185,152,122,68,58,33,106,216,219,95,212,0,111,231,19,175,100,191,52,109,206,104,175,0,90,205,147,29,232,169,11,47,185,180,6,98,219,248,152,174,248,31,10,63,53,152,225,180,78,84,191,127,106,245,48,122,205,198,221,29,175,44,237,5,164,74,199,29,99,243,227,218,143,58,182,71,132,107,122,221,166,56,73,128,154,16,232,141,93,111,10,188,218,39,146,248,108,233,110,223,14,218,216,252,57,243,113,27,234,47,176,204,39,69,241,48,6,182,236,72,129,25,76,235,108,195,14,87,88,208,176,20,75,92,150,129,239,56,96,120,202,103,221,177,137,82,238,69,255,141,249,242,179,197,156,80,241, +244,4,179,93,98,79,162,131,133,253,171,92,160,191,102,191,95,122,157,2,77,105,34,209,30,236,93,52,141,6,59,118,253,76,251,158,90,251,78,3,224,198,143,112,185,163,120,68,211,198,123,133,7,76,87,13,25,50,117,47,194,109,186,100,13,246,160,231,199,31,58,120,153,122,113,68,85,50,60,255,217,94,219,11,227,203,162,174,63,156,109,200,211,183,234,251,200,195,165,195,144,52,183,165,167,225,218,246,150,243,54,189,119,59,236,242,182,89,155,242,129,114,126,115,235,205,126,99,108,110,158,71,249,217,54,59,106,100,187,203,173,243,7,87,54,245,71,80,98,38,234,129,194,237,246,199,187,93,213,59,172,151,96,133,45,114,79,250,198,47,126,92,75,122,33,235,156,52,170,189,39,229,221,253,5,113,189,20,176,80,177,93,149,167,212,5,68,124,61,157,46,142,112,186,30,6,125,22,180,179,224,20,225,143,106,63,239,19,126,98,203,233,161,189,232,179,171,138,29,148,233,184,248,170,70,12,111,207,141,162,161,252,142,205,242,171,24,125,27,36,252,206,250,223,171,245, +179,245,116,218,34,218,38,203,239,24,85,89,109,158,89,197,120,120,255,222,250,114,253,77,82,98,168,163,239,24,52,159,11,60,102,203,103,70,114,136,199,152,228,59,70,95,71,236,227,243,24,252,123,73,157,90,176,241,153,201,67,237,114,40,135,234,201,1,46,216,127,200,241,27,69,199,180,108,99,111,65,198,238,33,171,25,117,43,207,86,12,52,103,105,109,112,24,113,55,180,179,80,223,109,185,34,21,218,111,41,233,146,6,33,253,214,5,157,132,201,150,180,130,68,202,203,35,13,44,141,255,202,21,133,187,35,119,87,191,182,174,178,217,98,180,56,94,28,99,52,238,204,114,113,124,119,119,183,56,238,158,3,223,64,79,92,13,197,44,22,47,76,185,56,218,53,191,66,8,90,115,61,188,190,254,47,75,101,23,210, diff --git a/uppbox/uppweb/www.tpp/all.i b/uppbox/uppweb/www.tpp/all.i index e9e2f5cfd..792be7bc9 100644 --- a/uppbox/uppweb/www.tpp/all.i +++ b/uppbox/uppweb/www.tpp/all.i @@ -2,310 +2,140 @@ TOPIC("20081chlog_en-us") #include "20081chlog_en-us.tppi" END_TOPIC -<<<<<<< .mine -TOPIC("FAQ_en-us") -#include "FAQ_en-us.tppi" -======= TOPIC("AssociatedProjects_en-us") #include "AssociatedProjects_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("Funding_en-us") -#include "Funding_en-us.tppi" -======= TOPIC("FAQ_en-us") #include "FAQ_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("LearnCpp_en-us") -#include "LearnCpp_en-us.tppi" -======= TOPIC("Funding_en-us") #include "Funding_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("RoadmapHistorical_en-us") -#include "RoadmapHistorical_en-us.tppi" -======= TOPIC("LearnCpp_en-us") #include "LearnCpp_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("Roadmap_en-us") -#include "Roadmap_en-us.tppi" -======= TOPIC("RoadmapHistorical_en-us") #include "RoadmapHistorical_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("SupportedPlatforms_en-us") -#include "SupportedPlatforms_en-us.tppi" -======= TOPIC("Roadmap_en-us") #include "Roadmap_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("Tutorials_en-us") -#include "Tutorials_en-us.tppi" -======= TOPIC("SupportedPlatforms_en-us") #include "SupportedPlatforms_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("UppTechnologies_en-us") -#include "UppTechnologies_en-us.tppi" -======= TOPIC("Tutorials_en-us") #include "Tutorials_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("bazaar_cont_koldo_en-us") -#include "bazaar_cont_koldo_en-us.tppi" -======= TOPIC("UppTechnologies_en-us") #include "UppTechnologies_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("bazaar_en-us") -#include "bazaar_en-us.tppi" -======= TOPIC("bazaar_cont_koldo_en-us") #include "bazaar_cont_koldo_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("bazaar_submission_en-us") -#include "bazaar_submission_en-us.tppi" -======= TOPIC("bazaar_en-us") #include "bazaar_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("bazaar_support_en-us") -#include "bazaar_support_en-us.tppi" -======= TOPIC("bazaar_submission_en-us") #include "bazaar_submission_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("bugreports_en-us") -#include "bugreports_en-us.tppi" -======= TOPIC("bazaar_support_en-us") #include "bazaar_support_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("codestyle_en-us") -#include "codestyle_en-us.tppi" -======= TOPIC("bugreports_en-us") #include "bugreports_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("community_en-us") -#include "community_en-us.tppi" -======= TOPIC("codestyle_en-us") #include "codestyle_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("comparison_en-us") -#include "comparison_en-us.tppi" -======= TOPIC("community_en-us") #include "community_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("cookie_en-us") -#include "cookie_en-us.tppi" -======= TOPIC("comparison_en-us") #include "comparison_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("devmovie_en-us") -#include "devmovie_en-us.tppi" -======= TOPIC("cookie_en-us") #include "cookie_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("documentation_en-us") -#include "documentation_en-us.tppi" -======= TOPIC("devmovie_en-us") #include "devmovie_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("download_en-us") -#include "download_en-us.tppi" -======= TOPIC("documentation_en-us") #include "documentation_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("examples_en-us") -#include "examples_en-us.tppi" -======= TOPIC("download_en-us") #include "download_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("extlinks_en-us") -#include "extlinks_en-us.tppi" -======= TOPIC("examples_en-us") #include "examples_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("idess_en-us") -#include "idess_en-us.tppi" -======= TOPIC("extlinks_en-us") #include "extlinks_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("index_en-us") -#include "index_en-us.tppi" -======= TOPIC("idess_en-us") #include "idess_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("linkDocumentation_en-us") -#include "linkDocumentation_en-us.tppi" -======= TOPIC("index_en-us") #include "index_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("linkExamples_en-us") -#include "linkExamples_en-us.tppi" -======= TOPIC("linkDocumentation_en-us") #include "linkDocumentation_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("nightly_en-us") -#include "nightly_en-us.tppi" -======= TOPIC("linkExamples_en-us") #include "linkExamples_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("overview_en-us") -#include "overview_en-us.tppi" -======= TOPIC("nightly_en-us") #include "nightly_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("reference_en-us") -#include "reference_en-us.tppi" -======= TOPIC("overview_en-us") #include "overview_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("slack_en-us") -#include "slack_en-us.tppi" -======= TOPIC("reference_en-us") #include "reference_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("ss_en-us") -#include "ss_en-us.tppi" -======= TOPIC("slack_en-us") #include "slack_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("ssposix_en-us") -#include "ssposix_en-us.tppi" -======= TOPIC("ss_en-us") #include "ss_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("ubuntuinstall_en-us") -#include "ubuntuinstall_en-us.tppi" -======= TOPIC("ssposix_en-us") #include "ssposix_en-us.tppi" ->>>>>>> .r11549 END_TOPIC -<<<<<<< .mine -TOPIC("uppx11_en-us") -#include "uppx11_en-us.tppi" -======= TOPIC("ubuntuinstall_en-us") #include "ubuntuinstall_en-us.tppi" ->>>>>>> .r11549 END_TOPIC TOPIC("uppx11_en-us")