r59476 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r59475‎ | r59476 | r59477 >
Date:22:57, 26 November 2009
Author:tstarling
Status:deferred
Tags:
Comment:
Did --record-only merges of r59446 and r59450 so that we can later merge the trunk into this branch without those revisions causing js2 to disappear.
Modified paths:
  • /branches/js2-work (modified) (history)
  • /branches/js2-work/phase3/includes/ConfEditor.php (modified) (history)
  • /branches/js2-work/phase3/js2/js2stopgap.js (modified) (history)
  • /branches/js2-work/phase3/js2/js2stopgap.min.js (modified) (history)

Diff [purge]

Property changes on: branches/js2-work/phase3/includes/ConfEditor.php
___________________________________________________________________
Name: svn:mergeinfo
11 -
22 + /trunk/phase3/phase3/includes/ConfEditor.php:59446,59450
Property changes on: branches/js2-work/phase3/js2/js2stopgap.js
___________________________________________________________________
Name: svn:mergeinfo
33 -
44 + /trunk/phase3/phase3/js2/js2stopgap.js:59446,59450
Property changes on: branches/js2-work/phase3/js2/js2stopgap.min.js
___________________________________________________________________
Name: svn:mergeinfo
55 -
66 + /trunk/phase3/phase3/js2/js2stopgap.min.js:59446,59450
Property changes on: branches/js2-work
___________________________________________________________________
Name: svn:mergeinfo
77 + /trunk/phase3:59446,59450

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r59446Removed JS2 work (has been moved to the js2-work branch). Has been lightly te...tstarling12:00, 26 November 2009
r59450Partial revert of r59446: add js2stopgap.js back in, some extensions (at leas...catrope14:24, 26 November 2009

Status & tagging log