OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove conflict indicators.

Browse Source 
From-SVN: r80767
This commit is contained in:
Bryce McKinlay 2004-04-16 20:38:52 +01:00
parent bf7ad40253
commit 46fcabbc89
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libjava/ChangeLog
View File

@ -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.