Skip to content

R
riscv-gcc-1
Commit 46fcabbc by Bryce McKinlay
Options

Remove conflict indicators. 

From-SVN: r80767
parent bf7ad402
Showing with 0 additions and 1 deletions
libjava/ChangeLog
......@@ -264,7 +264,6 @@
* java/applet/Applet.java (getPreferredSize): New method.
(getMinimumSize): New method.
>>>>>>> 1.2732
2004-04-15 Bryce McKinlay <mckinlay@redhat.com>
* prims.cc (_Jv_AllocObject): Remove `size' argument.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment