Property changes on: branches/wmf-deployment/skins/monobook |
___________________________________________________________________ |
Name: svn:mergeinfo |
1 | 1 | - /branches/REL1_15/phase3/skins/monobook:51646 |
/trunk/phase3/skins/monobook:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53012,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53777,54384,54494 |
2 | 2 | + /branches/REL1_15/phase3/skins/monobook:51646 |
/trunk/phase3/skins/monobook:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53012,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53777,54384,54494,54592 |
Index: branches/wmf-deployment/skins/Vector.php |
— | — | @@ -539,33 +539,33 @@ |
540 | 540 | <?php $this->renderPortals( $this->data['sidebar'] ); ?> |
541 | 541 | </div> |
542 | 542 | <!-- /panel --> |
543 | | - <!-- foot --> |
544 | | - <div id="foot"> |
| 543 | + <!-- logo --> |
| 544 | + <div id="p-logo"><a style="background-image: url(<?php $this->text( 'logopath' ) ?>);" href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>" <?php echo $this->skin->tooltipAndAccesskey( 'p-logo' ) ?>></a></div> |
| 545 | + <!-- /logo --> |
| 546 | + <!-- footer --> |
| 547 | + <div id="footer"> |
545 | 548 | <?php foreach( $validFooterLinks as $category => $links ): ?> |
546 | 549 | <?php if ( count( $links ) > 0 ): ?> |
547 | | - <ul id="foot-<?php echo $category ?>"> |
| 550 | + <ul id="footer-<?php echo $category ?>"> |
548 | 551 | <?php foreach( $links as $link ): ?> |
549 | 552 | <?php if( isset( $this->data[$link] ) && $this->data[$link] ): ?> |
550 | | - <li id="foot-<?php echo $category ?>-<?php echo $link ?>"><?php $this->html( $link ) ?></li> |
| 553 | + <li id="footer-<?php echo $category ?>-<?php echo $link ?>"><?php $this->html( $link ) ?></li> |
551 | 554 | <?php endif; ?> |
552 | 555 | <?php endforeach; ?> |
553 | 556 | </ul> |
554 | 557 | <?php endif; ?> |
555 | 558 | <?php endforeach; ?> |
556 | | - <ul id="foot-icons" class="noprint"> |
| 559 | + <ul id="footer-icons" class="noprint"> |
557 | 560 | <?php if ( $this->data['poweredbyico'] ): ?> |
558 | | - <li id="foot-icon-poweredby"><?php $this->html( 'poweredbyico' ) ?></li> |
| 561 | + <li id="footer-icon-poweredby"><?php $this->html( 'poweredbyico' ) ?></li> |
559 | 562 | <?php endif; ?> |
560 | 563 | <?php if ( $this->data['copyrightico'] ): ?> |
561 | | - <li id="foot-icon-copyright"><?php $this->html( 'copyrightico' ) ?></li> |
| 564 | + <li id="footer-icon-copyright"><?php $this->html( 'copyrightico' ) ?></li> |
562 | 565 | <?php endif; ?> |
563 | 566 | </ul> |
564 | 567 | <div style="clear:both"></div> |
565 | 568 | </div> |
566 | | - <!-- /foot --> |
567 | | - <!-- logo --> |
568 | | - <div id="p-logo"><a style="background-image: url(<?php $this->text( 'logopath' ) ?>);" href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>" <?php echo $this->skin->tooltipAndAccesskey( 'p-logo' ) ?>></a></div> |
569 | | - <!-- /logo --> |
| 569 | + <!-- /footer --> |
570 | 570 | <!-- fixalpha --> |
571 | 571 | <script type="<?php $this->text('jsmimetype') ?>"> if ( window.isMSIE55 ) fixalpha(); </script> |
572 | 572 | <!-- /fixalpha --> |
Property changes on: branches/wmf-deployment/skins/Vector.php |
___________________________________________________________________ |
Name: svn:mergeinfo |
573 | 573 | - /branches/REL1_15/phase3/skins/Vector.php:51646 |
/trunk/phase3/skins/Vector.php:52089-54460,54494 |
574 | 574 | + /branches/REL1_15/phase3/skins/Vector.php:51646 |
/trunk/phase3/skins/Vector.php:52089-54460,54494,54592 |
Index: branches/wmf-deployment/skins/vector/main-ltr.css |
— | — | @@ -377,8 +377,8 @@ |
378 | 378 | #panel div.portal div.body ul li a:visited { |
379 | 379 | color: #0b0080; |
380 | 380 | } |
381 | | -/* Foot */ |
382 | | -#foot { |
| 381 | +/* Footer */ |
| 382 | +#footer { |
383 | 383 | margin-left: 12em; |
384 | 384 | margin-top: 0; |
385 | 385 | padding: 0.75em; |
— | — | @@ -386,12 +386,14 @@ |
387 | 387 | background-position: top left; |
388 | 388 | background-repeat: repeat-x; |
389 | 389 | } |
390 | | -#foot ul { |
| 390 | +#footer ul { |
391 | 391 | list-style: none; |
| 392 | + list-style-image: none; |
| 393 | + list-style-type: none; |
392 | 394 | margin: 0; |
393 | 395 | padding: 0; |
394 | 396 | } |
395 | | -#foot ul li { |
| 397 | +#footer ul li { |
396 | 398 | margin: 0; |
397 | 399 | padding: 0; |
398 | 400 | padding-top: 0.5em; |
— | — | @@ -399,21 +401,21 @@ |
400 | 402 | color: #333333; |
401 | 403 | font-size: 0.9em; |
402 | 404 | } |
403 | | -#foot #foot-icons { |
| 405 | +#footer #footer-icons { |
404 | 406 | float: right; |
405 | 407 | } |
406 | | -#foot #foot-places { |
| 408 | +#footer #footer-places { |
407 | 409 | float: left; |
408 | 410 | } |
409 | | -#foot #foot-info li { |
| 411 | +#footer #footer-info li { |
410 | 412 | line-height: 1.4em; |
411 | 413 | } |
412 | | -#foot #foot-icons li { |
| 414 | +#footer #footer-icons li { |
413 | 415 | float: left; |
414 | 416 | margin-left: 0.5em; |
415 | 417 | line-height: 2em; |
416 | 418 | } |
417 | | -#foot #foot-places li { |
| 419 | +#footer #footer-places li { |
418 | 420 | float: left; |
419 | 421 | margin-right: 1em; |
420 | 422 | line-height: 2em; |
Index: branches/wmf-deployment/skins/vector/main-rtl.css |
— | — | @@ -377,8 +377,8 @@ |
378 | 378 | #panel div.portal div.body ul li a:visited { |
379 | 379 | color: #0b0080; |
380 | 380 | } |
381 | | -/* Foot */ |
382 | | -#foot { |
| 381 | +/* Footer */ |
| 382 | +#footer { |
383 | 383 | margin-right: 12em; |
384 | 384 | margin-top: 0; |
385 | 385 | padding: 0.75em; |
— | — | @@ -386,12 +386,14 @@ |
387 | 387 | background-position: top right; |
388 | 388 | background-repeat: repeat-x; |
389 | 389 | } |
390 | | -#foot ul { |
| 390 | +#footer ul { |
391 | 391 | list-style: none; |
| 392 | + list-style-image: none; |
| 393 | + list-style-type: none; |
392 | 394 | margin: 0; |
393 | 395 | padding: 0; |
394 | 396 | } |
395 | | -#foot ul li { |
| 397 | +#footer ul li { |
396 | 398 | margin: 0; |
397 | 399 | padding: 0; |
398 | 400 | padding-top: 0.5em; |
— | — | @@ -399,21 +401,21 @@ |
400 | 402 | color: #333333; |
401 | 403 | font-size: 0.9em; |
402 | 404 | } |
403 | | -#foot #foot-icons { |
| 405 | +#footer #footer-icons { |
404 | 406 | float: left; |
405 | 407 | } |
406 | | -#foot #foot-places { |
| 408 | +#footer #footer-places { |
407 | 409 | float: right; |
408 | 410 | } |
409 | | -#foot #foot-info li { |
| 411 | +#footer #footer-info li { |
410 | 412 | line-height: 1.4em; |
411 | 413 | } |
412 | | -#foot #foot-icons li { |
| 414 | +#footer #footer-icons li { |
413 | 415 | float: right; |
414 | 416 | margin-right: 0.5em; |
415 | 417 | line-height: 2em; |
416 | 418 | } |
417 | | -#foot #foot-places li { |
| 419 | +#footer #footer-places li { |
418 | 420 | float: right; |
419 | 421 | margin-left: 1em; |
420 | 422 | line-height: 2em; |
Property changes on: branches/wmf-deployment/skins/vector |
___________________________________________________________________ |
Name: svn:mergeinfo |
421 | 423 | - /branches/REL1_15/phase3/skins/vector:51646 |
/trunk/phase3/skins/vector:52089-54460,54494 |
422 | 424 | + /branches/REL1_15/phase3/skins/vector:51646 |
/trunk/phase3/skins/vector:52089-54460,54494,54592 |
Property changes on: branches/wmf-deployment/extensions/CodeReview |
___________________________________________________________________ |
Name: svn:mergeinfo |
423 | 425 | - /branches/REL1_15/phase3/extensions/CodeReview:51646 |
/trunk/extensions/CodeReview:52089-54497 |
/trunk/phase3/CodeReview:52859,53272 |
/trunk/phase3/extensions/CodeReview:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52879,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494 |
424 | 426 | + /branches/REL1_15/phase3/extensions/CodeReview:51646 |
/trunk/extensions/CodeReview:52089-54497 |
/trunk/phase3/CodeReview:52859,53272 |
/trunk/phase3/extensions/CodeReview:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52879,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592 |
Property changes on: branches/wmf-deployment/extensions/HoneypotIntegration |
___________________________________________________________________ |
Name: svn:mergeinfo |
425 | 427 | - /branches/REL1_15/phase3/extensions/HoneypotIntegration:51646 |
/trunk/extensions/HoneypotIntegration:52089-54593 |
/trunk/phase3/HoneypotIntegration:52859,53272 |
/trunk/phase3/extensions/HoneypotIntegration:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494 |
426 | 428 | + /branches/REL1_15/phase3/extensions/HoneypotIntegration:51646 |
/trunk/extensions/HoneypotIntegration:52089-54593 |
/trunk/phase3/HoneypotIntegration:52859,53272 |
/trunk/phase3/extensions/HoneypotIntegration:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592 |
Property changes on: branches/wmf-deployment/extensions/TitleKey |
___________________________________________________________________ |
Name: svn:mergeinfo |
427 | 429 | - /branches/REL1_15/phase3/extensions/TitleKey:51646 |
/trunk/extensions/TitleKey:52089-54533 |
/trunk/phase3/TitleKey:52859,53272 |
/trunk/phase3/extensions/TitleKey:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494 |
428 | 430 | + /branches/REL1_15/phase3/extensions/TitleKey:51646 |
/trunk/extensions/TitleKey:52089-54533 |
/trunk/phase3/TitleKey:52859,53272 |
/trunk/phase3/extensions/TitleKey:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592 |
Property changes on: branches/wmf-deployment/extensions/MWSearch |
___________________________________________________________________ |
Name: svn:mergeinfo |
429 | 431 | - /branches/REL1_15/phase3/extensions/MWSearch:51646 |
/trunk/extensions/MWSearch:52859,52871-52872,52876,53191,53205-53206,53272,54125 |
/trunk/phase3/MWSearch:52859,53272 |
/trunk/phase3/extensions/MWSearch:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53777,54384,54494 |
430 | 432 | + /branches/REL1_15/phase3/extensions/MWSearch:51646 |
/trunk/extensions/MWSearch:52859,52871-52872,52876,53191,53205-53206,53272,54125 |
/trunk/phase3/MWSearch:52859,53272 |
/trunk/phase3/extensions/MWSearch:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53777,54384,54494,54592 |
Property changes on: branches/wmf-deployment/extensions/CentralAuth |
___________________________________________________________________ |
Name: svn:mergeinfo |
431 | 433 | - /branches/REL1_15/phase3/extensions/CentralAuth:51646 |
/trunk/extensions/CentralAuth:52859,52871-52872,52876,53191,53205-53206,53272,53602 |
/trunk/phase3/CentralAuth:52859,53272 |
/trunk/phase3/extensions/CentralAuth:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494 |
432 | 434 | + /branches/REL1_15/phase3/extensions/CentralAuth:51646 |
/trunk/extensions/CentralAuth:52859,52871-52872,52876,53191,53205-53206,53272,53602 |
/trunk/phase3/CentralAuth:52859,53272 |
/trunk/phase3/extensions/CentralAuth:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592 |
Property changes on: branches/wmf-deployment/extensions/SecurePoll/cli/wm-scripts |
___________________________________________________________________ |
Name: svn:mergeinfo |
433 | 435 | - /branches/REL1_15/phase3/extensions/SecurePoll/cli/wm-scripts:51646 |
/trunk/extensions/SecurePoll/cli/wm-scripts:52089-53866,54105 |
/trunk/phase3/SecurePoll/cli/wm-scripts:52859,53272 |
/trunk/phase3/extensions/SecurePoll/cli/wm-scripts:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494 |
434 | 436 | + /branches/REL1_15/phase3/extensions/SecurePoll/cli/wm-scripts:51646 |
/trunk/extensions/SecurePoll/cli/wm-scripts:52089-53866,54105 |
/trunk/phase3/SecurePoll/cli/wm-scripts:52859,53272 |
/trunk/phase3/extensions/SecurePoll/cli/wm-scripts:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592 |
Property changes on: branches/wmf-deployment/extensions/SecurePoll |
___________________________________________________________________ |
Name: svn:mergeinfo |
435 | 437 | - /branches/REL1_15/phase3/extensions/SecurePoll:51646 |
/trunk/extensions/SecurePoll:52089-53866 |
/trunk/phase3/SecurePoll:52859,53272 |
/trunk/phase3/extensions/SecurePoll:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494 |
436 | 438 | + /branches/REL1_15/phase3/extensions/SecurePoll:51646 |
/trunk/extensions/SecurePoll:52089-53866 |
/trunk/phase3/SecurePoll:52859,53272 |
/trunk/phase3/extensions/SecurePoll:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592 |
Property changes on: branches/wmf-deployment/extensions |
___________________________________________________________________ |
Name: svn:mergeinfo |
437 | 439 | - /branches/REL1_15/phase3/extensions:51646 |
/trunk/extensions:52859,52871-52872,52876,53191,53205-53206,53272 |
/trunk/phase3:52859,53272 |
/trunk/phase3/extensions:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494 |
438 | 440 | + /branches/REL1_15/phase3/extensions:51646 |
/trunk/extensions:52859,52871-52872,52876,53191,53205-53206,53272 |
/trunk/phase3:52859,53272 |
/trunk/phase3/extensions:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592 |
Property changes on: branches/wmf-deployment/includes/api/ApiQueryCategoryMembers.php |
___________________________________________________________________ |
Name: svn:mergeinfo |
439 | 441 | - /branches/REL1_15/phase3/includes/api/ApiQueryCategoryMembers.php:51646 |
/trunk/phase3/includes/api/ApiQueryCategoryMembers.php:28215,52089-53052,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494 |
440 | 442 | + /branches/REL1_15/phase3/includes/api/ApiQueryCategoryMembers.php:51646 |
/trunk/phase3/includes/api/ApiQueryCategoryMembers.php:28215,52089-53052,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592 |
Property changes on: branches/wmf-deployment/includes/ConfEditor.php |
___________________________________________________________________ |
Name: svn:mergeinfo |
441 | 443 | - /trunk/phase3/includes/ConfEditor.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494 |
442 | 444 | + /trunk/phase3/includes/ConfEditor.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592 |
Property changes on: branches/wmf-deployment/includes/specials/SpecialUserrights.php |
___________________________________________________________________ |
Name: svn:mergeinfo |
443 | 445 | - /trunk/phase3/includes/specials/SpecialUserrights.php:36354-52116,52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494 |
444 | 446 | + /trunk/phase3/includes/specials/SpecialUserrights.php:36354-52116,52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592 |
Property changes on: branches/wmf-deployment/includes/specials/SpecialSearch.php |
___________________________________________________________________ |
Name: svn:mergeinfo |
445 | 447 | - /trunk/phase3/includes/specials/SpecialSearch.php:36354-52665,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494 |
446 | 448 | + /trunk/phase3/includes/specials/SpecialSearch.php:36354-52665,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592 |
Property changes on: branches/wmf-deployment/includes/specials |
___________________________________________________________________ |
Name: svn:mergeinfo |
447 | 449 | - /trunk/phase3/includes/specials:36354-52088,52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494 |
448 | 450 | + /trunk/phase3/includes/specials:36354-52088,52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592 |
Property changes on: branches/wmf-deployment/includes/Skin.php |
___________________________________________________________________ |
Name: svn:mergeinfo |
449 | 451 | - /branches/REL1_15/phase3/includes/Skin.php:51646 |
/trunk/phase3/includes/Skin.php:52089-52361,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52879,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494 |
450 | 452 | + /branches/REL1_15/phase3/includes/Skin.php:51646 |
/trunk/phase3/includes/Skin.php:52089-52361,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52879,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592 |
Property changes on: branches/wmf-deployment |
___________________________________________________________________ |
Name: svn:mergeinfo |
451 | 453 | - /branches/REL1_15/phase3:51646 |
/trunk/phase3:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494 |
452 | 454 | + /branches/REL1_15/phase3:51646 |
/trunk/phase3:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494,54592 |