| Index: trunk/tools/make-wmf-branch/default.conf |
| — | — | @@ -145,8 +145,9 @@ |
| 146 | 146 | $patches = array( |
| 147 | 147 | array( 'rev' => 97505, 'base' => '^/branches/wmf/1.18wmf1' ), |
| 148 | 148 | array( 'rev' => 97508, 'base' => '^/branches/wmf/1.18wmf1' ), |
| 149 | | - array( 'rev' => 97509, 'base' => '^/branches/wmf/1.18wmf1' ), |
| | 149 | + array( 'rev' => 97509, 'base' => '^/branches/wmf/1.18wmf1' ), // r96552 part merged to trunk |
| 150 | 150 | array( 'rev' => 97512, 'base' => '^/branches/wmf/1.18wmf1' ), |
| | 151 | + array( 'rev' => 99928, 'base' => '^/branches/wmf/1.18wmf1' ), |
| 151 | 152 | ); |
| 152 | 153 | |
| 153 | 154 | $dryRun = false; |