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,53344,53369,53427,53777,54384,54494,54592 |
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,53344,53369,53427,53777,54384,54494,54592,54599-54602,54604,54613 |
Index: branches/wmf-deployment/skins/common/edit.js |
— | — | @@ -146,7 +146,7 @@ |
147 | 147 | var editBox = document.getElementById( 'wpTextbox1' ); |
148 | 148 | var scrollTop = document.getElementById( 'wpScrolltop' ); |
149 | 149 | var editForm = document.getElementById( 'editform' ); |
150 | | - if( editBox && scrollTop ) { |
| 150 | + if( editForm && editBox && scrollTop ) { |
151 | 151 | if( scrollTop.value ) |
152 | 152 | editBox.scrollTop = scrollTop.value; |
153 | 153 | addHandler( editForm, 'submit', function() { |
Index: branches/wmf-deployment/skins/Vector.php |
— | — | @@ -536,12 +536,12 @@ |
537 | 537 | <!-- /header --> |
538 | 538 | <!-- panel --> |
539 | 539 | <div id="panel" class="noprint"> |
| 540 | + <!-- logo --> |
| 541 | + <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> |
| 542 | + <!-- /logo --> |
540 | 543 | <?php $this->renderPortals( $this->data['sidebar'] ); ?> |
541 | 544 | </div> |
542 | 545 | <!-- /panel --> |
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 | 546 | <!-- footer --> |
547 | 547 | <div id="footer"> |
548 | 548 | <?php foreach( $validFooterLinks as $category => $links ): ?> |
Property changes on: branches/wmf-deployment/skins/Vector.php |
___________________________________________________________________ |
Name: svn:mergeinfo |
549 | 549 | - /branches/REL1_15/phase3/skins/Vector.php:51646 |
/trunk/phase3/skins/Vector.php:52089-54460,54494,54592 |
550 | 550 | + /branches/REL1_15/phase3/skins/Vector.php:51646 |
/trunk/phase3/skins/Vector.php:52089-54460,54494,54592,54599-54602,54604,54613 |
Index: branches/wmf-deployment/skins/vector/main-ltr.css |
— | — | @@ -21,7 +21,7 @@ |
22 | 22 | margin: 0; |
23 | 23 | padding: 0; |
24 | 24 | font-family: sans-serif; |
25 | | - font-size: 9.75pt; |
| 25 | + font-size: 0.9em; |
26 | 26 | } |
27 | 27 | body { |
28 | 28 | background-color: #f3f3f3; |
— | — | @@ -246,6 +246,8 @@ |
247 | 247 | border: solid 1px silver; |
248 | 248 | border-top-width: 0; |
249 | 249 | list-style: none; |
| 250 | + list-style-image: none; |
| 251 | + list-style-type: none; |
250 | 252 | padding: 0; |
251 | 253 | margin: 0; |
252 | 254 | margin-left: -1px; |
— | — | @@ -309,7 +311,7 @@ |
310 | 312 | border-width: 0; |
311 | 313 | padding: 0.25em; |
312 | 314 | line-height: 1em; |
313 | | - font-size: 9.75pt; |
| 315 | + font-size: 0.9em; |
314 | 316 | width: 9em; |
315 | 317 | background-color: transparent; |
316 | 318 | } |
— | — | @@ -318,7 +320,7 @@ |
319 | 321 | margin: 0; |
320 | 322 | padding: 0; |
321 | 323 | width: 1.75em; |
322 | | - height: 2em; |
| 324 | + height: 1.5em; |
323 | 325 | border: none; |
324 | 326 | cursor: pointer; |
325 | 327 | background-color: transparent; |
— | — | @@ -423,7 +425,7 @@ |
424 | 426 | /* Logo */ |
425 | 427 | #p-logo { |
426 | 428 | position: absolute; |
427 | | - top: 0; |
| 429 | + top: -12em; |
428 | 430 | left: 0; |
429 | 431 | height: 12em; |
430 | 432 | width: 12em; |
Index: branches/wmf-deployment/skins/vector/main-rtl.css |
— | — | @@ -21,7 +21,7 @@ |
22 | 22 | margin: 0; |
23 | 23 | padding: 0; |
24 | 24 | font-family: sans-serif; |
25 | | - font-size: 9.75pt; |
| 25 | + font-size: 0.9em; |
26 | 26 | } |
27 | 27 | body { |
28 | 28 | background-color: #f3f3f3; |
— | — | @@ -246,6 +246,8 @@ |
247 | 247 | border: solid 1px silver; |
248 | 248 | border-top-width: 0; |
249 | 249 | list-style: none; |
| 250 | + list-style-image: none; |
| 251 | + list-style-type: none; |
250 | 252 | padding: 0; |
251 | 253 | margin: 0; |
252 | 254 | margin-right: -1px; |
— | — | @@ -309,7 +311,7 @@ |
310 | 312 | border-width: 0; |
311 | 313 | padding: 0.25em; |
312 | 314 | line-height: 1em; |
313 | | - font-size: 9.75pt; |
| 315 | + font-size: 0.9em; |
314 | 316 | width: 9em; |
315 | 317 | background-color: transparent; |
316 | 318 | } |
— | — | @@ -318,7 +320,7 @@ |
319 | 321 | margin: 0; |
320 | 322 | padding: 0; |
321 | 323 | width: 1.75em; |
322 | | - height: 2em; |
| 324 | + height: 1.5em; |
323 | 325 | border: none; |
324 | 326 | cursor: pointer; |
325 | 327 | background-color: transparent; |
— | — | @@ -423,7 +425,7 @@ |
424 | 426 | /* Logo */ |
425 | 427 | #p-logo { |
426 | 428 | position: absolute; |
427 | | - top: 0; |
| 429 | + top: -12em; |
428 | 430 | right: 0; |
429 | 431 | height: 12em; |
430 | 432 | width: 12em; |
Property changes on: branches/wmf-deployment/skins/vector |
___________________________________________________________________ |
Name: svn:mergeinfo |
431 | 433 | - /branches/REL1_15/phase3/skins/vector:51646 |
/trunk/phase3/skins/vector:52089-54460,54494,54592 |
432 | 434 | + /branches/REL1_15/phase3/skins/vector:51646 |
/trunk/phase3/skins/vector:52089-54460,54494,54592,54599-54602,54604,54613 |
Property changes on: branches/wmf-deployment/extensions/CodeReview |
___________________________________________________________________ |
Name: svn:mergeinfo |
433 | 435 | - /branches/REL1_15/phase3/extensions/CodeReview:51646 |
/trunk/extensions/CodeReview:52089-54497,54715 |
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592 |
434 | 436 | + /branches/REL1_15/phase3/extensions/CodeReview:51646 |
/trunk/extensions/CodeReview:52089-54497,54715 |
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613 |
Property changes on: branches/wmf-deployment/extensions/HoneypotIntegration |
___________________________________________________________________ |
Name: svn:mergeinfo |
435 | 437 | - /branches/REL1_15/phase3/extensions/HoneypotIntegration:51646 |
/trunk/extensions/HoneypotIntegration:52089-54593,54715 |
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592 |
436 | 438 | + /branches/REL1_15/phase3/extensions/HoneypotIntegration:51646 |
/trunk/extensions/HoneypotIntegration:52089-54593,54715 |
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613 |
Property changes on: branches/wmf-deployment/extensions/TitleKey |
___________________________________________________________________ |
Name: svn:mergeinfo |
437 | 439 | - /branches/REL1_15/phase3/extensions/TitleKey:51646 |
/trunk/extensions/TitleKey:52089-54533,54715 |
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592 |
438 | 440 | + /branches/REL1_15/phase3/extensions/TitleKey:51646 |
/trunk/extensions/TitleKey:52089-54533,54715 |
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613 |
Property changes on: branches/wmf-deployment/extensions/MWSearch |
___________________________________________________________________ |
Name: svn:mergeinfo |
439 | 441 | - /branches/REL1_15/phase3/extensions/MWSearch:51646 |
/trunk/extensions/MWSearch:52859,52871-52872,52876,53191,53205-53206,53272,54125,54715 |
/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,53344,53369,53427,53777,54384,54494,54592 |
440 | 442 | + /branches/REL1_15/phase3/extensions/MWSearch:51646 |
/trunk/extensions/MWSearch:52859,52871-52872,52876,53191,53205-53206,53272,54125,54715 |
/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,53344,53369,53427,53777,54384,54494,54592,54599-54602,54604,54613 |
Property changes on: branches/wmf-deployment/extensions/CentralAuth |
___________________________________________________________________ |
Name: svn:mergeinfo |
441 | 443 | - /branches/REL1_15/phase3/extensions/CentralAuth:51646 |
/trunk/extensions/CentralAuth:52859,52871-52872,52876,53191,53205-53206,53272,53602,54715 |
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592 |
442 | 444 | + /branches/REL1_15/phase3/extensions/CentralAuth:51646 |
/trunk/extensions/CentralAuth:52859,52871-52872,52876,53191,53205-53206,53272,53602,54715 |
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613 |
Property changes on: branches/wmf-deployment/extensions/SecurePoll/cli/wm-scripts |
___________________________________________________________________ |
Name: svn:mergeinfo |
443 | 445 | - /branches/REL1_15/phase3/extensions/SecurePoll/cli/wm-scripts:51646 |
/trunk/extensions/SecurePoll/cli/wm-scripts:52089-53866,54105,54715 |
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592 |
444 | 446 | + /branches/REL1_15/phase3/extensions/SecurePoll/cli/wm-scripts:51646 |
/trunk/extensions/SecurePoll/cli/wm-scripts:52089-53866,54105,54715 |
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613 |
Property changes on: branches/wmf-deployment/extensions/SecurePoll |
___________________________________________________________________ |
Name: svn:mergeinfo |
445 | 447 | - /branches/REL1_15/phase3/extensions/SecurePoll:51646 |
/trunk/extensions/SecurePoll:52089-53866,54715 |
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592 |
446 | 448 | + /branches/REL1_15/phase3/extensions/SecurePoll:51646 |
/trunk/extensions/SecurePoll:52089-53866,54715 |
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613 |
Property changes on: branches/wmf-deployment/extensions |
___________________________________________________________________ |
Name: svn:mergeinfo |
447 | 449 | - /branches/REL1_15/phase3/extensions:51646 |
/trunk/extensions:52859,52871-52872,52876,53191,53205-53206,53272,54715 |
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592 |
448 | 450 | + /branches/REL1_15/phase3/extensions:51646 |
/trunk/extensions:52859,52871-52872,52876,53191,53205-53206,53272,54715 |
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613 |
Property changes on: branches/wmf-deployment/includes/api/ApiQueryCategoryMembers.php |
___________________________________________________________________ |
Name: svn:mergeinfo |
449 | 451 | - /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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592 |
450 | 452 | + /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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613 |
Property changes on: branches/wmf-deployment/includes/ConfEditor.php |
___________________________________________________________________ |
Name: svn:mergeinfo |
451 | 453 | - /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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592 |
452 | 454 | + /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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613 |
Index: branches/wmf-deployment/includes/DefaultSettings.php |
— | — | @@ -1501,7 +1501,7 @@ |
1502 | 1502 | * to ensure that client-side caches do not keep obsolete copies of global |
1503 | 1503 | * styles. |
1504 | 1504 | */ |
1505 | | -$wgStyleVersion = '233x'; |
| 1505 | +$wgStyleVersion = '233y'; |
1506 | 1506 | |
1507 | 1507 | |
1508 | 1508 | # Server-side caching: |
Property changes on: branches/wmf-deployment/includes/specials/SpecialUserrights.php |
___________________________________________________________________ |
Name: svn:mergeinfo |
1509 | 1509 | - /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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592 |
1510 | 1510 | + /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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613 |
Property changes on: branches/wmf-deployment/includes/specials/SpecialSearch.php |
___________________________________________________________________ |
Name: svn:mergeinfo |
1511 | 1511 | - /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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592 |
1512 | 1512 | + /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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613 |
Property changes on: branches/wmf-deployment/includes/specials |
___________________________________________________________________ |
Name: svn:mergeinfo |
1513 | 1513 | - /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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592 |
1514 | 1514 | + /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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613 |
Property changes on: branches/wmf-deployment/includes/Skin.php |
___________________________________________________________________ |
Name: svn:mergeinfo |
1515 | 1515 | - /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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592 |
1516 | 1516 | + /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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613 |
Property changes on: branches/wmf-deployment |
___________________________________________________________________ |
Name: svn:mergeinfo |
1517 | 1517 | - /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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592 |
1518 | 1518 | + /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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613 |