Paul Jenner reported to me a rather strange looking change in Changelog: http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.6794&tr2=1.6795&r1=text&r2=text
I correct is as I think it should be. 2006-03-30 Audrius Meskauskas <[EMAIL PROTECTED]> Changelog: Fixed 2006-03-17 wrongly resolved conflict. Audrius.
Index: ChangeLog =================================================================== RCS file: /sources/classpath/classpath/ChangeLog,v retrieving revision 1.6946 diff -u -r1.6946 ChangeLog --- ChangeLog 29 Mar 2006 23:23:36 -0000 1.6946 +++ ChangeLog 30 Mar 2006 17:16:33 -0000 @@ -2059,9 +2059,18 @@ 2006-03-17 Roman Kennke <[EMAIL PROTECTED]> - * gnu/java/rmi/activation/ActivationSystemTransient.java (debug): - Set to false. - + * javax/swing/plaf/basic/BasicButtonUI.java + (installDefaults): Only install UI margin if installed margin. + is null or a UIResource. + (uninstallDefaults): Only uninstall margin if it's + a UIResource. + + 2006-03-17 Robert Schuster <[EMAIL PROTECTED]> + + * javax/swing/text/DefaultCaret.java: + (mouseClicked) Use setDot() and moveDot() instead of + JTextComponent.select(). + 2006-03-17 Robert Schuster <[EMAIL PROTECTED]> * javax/swing/text/DefaultEditorKit.java: Refactored anonymous
