Menu ▾ ▴

Commit [r5328]  Maximize  Restore  History

Merging trunk into branch.

mgricken@... ~/drjava/drjava-guiAvailListener
% svn merge -r 5321:head ../drjava

--- Merging r5322 through r5327 into '.':
C src/edu/rice/cs/drjava/ui/MainFrame.java
U src/edu/rice/cs/drjava/ui/RecentFileManager.java
U src/edu/rice/cs/drjava/ui/DetachedFrame.java
U src/edu/rice/cs/drjava/ui/KeyBindingManager.java
U src/edu/rice/cs/util/swing/Utilities.java
Summary of conflicts:
Text conflicts: 1

_M .
M src/edu/rice/cs/drjava/ui/MainFrame.java
M src/edu/rice/cs/drjava/ui/RecentFileManager.java
M src/edu/rice/cs/drjava/ui/DetachedFrame.java
M src/edu/rice/cs/drjava/ui/KeyBindingManager.java
M src/edu/rice/cs/util/swing/Utilities.java

mgricken 2010-07-19

Browse code at this revision

Parent: [r5327]

Child: [r5329]

changed /branches/drjava-guiAvailListener
changed /branches/drjava-guiAvailListener/src/edu/rice/cs/drjava/ui/DetachedFrame.java
changed /branches/drjava-guiAvailListener/src/edu/rice/cs/drjava/ui/KeyBindingManager.java
changed /branches/drjava-guiAvailListener/src/edu/rice/cs/drjava/ui/MainFrame.java
changed /branches/drjava-guiAvailListener/src/edu/rice/cs/drjava/ui/RecentFileManager.java
changed /branches/drjava-guiAvailListener/src/edu/rice/cs/util/swing/Utilities.java
/branches/drjava-guiAvailListener
Directory.
/branches/drjava-guiAvailListener/src/edu/rice/cs/drjava/ui/DetachedFrame.java Diff Switch to side-by-side view
Loading...
/branches/drjava-guiAvailListener/src/edu/rice/cs/drjava/ui/KeyBindingManager.java Diff Switch to side-by-side view
Loading...
/branches/drjava-guiAvailListener/src/edu/rice/cs/drjava/ui/MainFrame.java Diff Switch to side-by-side view
Loading...
/branches/drjava-guiAvailListener/src/edu/rice/cs/drjava/ui/RecentFileManager.java Diff Switch to side-by-side view
Loading...
/branches/drjava-guiAvailListener/src/edu/rice/cs/util/swing/Utilities.java Diff Switch to side-by-side view
Loading...
MongoDB Logo MongoDB