diff options
| author | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-10 05:54:40 +0000 |
|---|---|---|
| committer | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-10 05:54:40 +0000 |
| commit | a4b57ca1209c39ec7d6d544b05530730f6e2cce0 (patch) | |
| tree | 7c3716a1af419dfd0708bf31ac19269b4b3749e1 /libjava/java/sql/Driver.java | |
| parent | fac55a463ca2820bf9d76ba70b9dc1b75aff6fe0 (diff) | |
| download | ppe42-gcc-a4b57ca1209c39ec7d6d544b05530730f6e2cce0.tar.gz ppe42-gcc-a4b57ca1209c39ec7d6d544b05530730f6e2cce0.zip | |
* ChangeLog: Resolve conflict.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@43887 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/sql/Driver.java')
0 files changed, 0 insertions, 0 deletions
