fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20000501-23:21 GMT+2 Maurilio Longo <maurilio.longo@libero.it>

Browse Source
This commit is contained in:
Maurilio Longo
2000-05-01 21:23:13 +00:00
parent 764fc7510c
commit bcd7650437
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
harbour/ChangeLog
View File

@@ -1,3 +1,9 @@
20000501-23:21 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
* ChangeLog
! cvs server: warning: file `harbour/ChangeLog' seems to still contain conflict indicators
Removed conflict indicators.
20000501-23:19 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
* source/rtl/teditor.prg
@@ -117,15 +123,9 @@
* some common parts moved into separate functions
*include/hbcomp.h
<<<<<<< ChangeLog
* changed 'BYTE iJumps' into 'ULONG iJumps' to stop reallocation
error mentioned by Victor
* changed 'BYTE iJumps' into 'ULONG iJumps' to stop reallocation
error mentioned by Victor
=======
* changed 'BYTE iJumps' into 'ULONG iJumps' to stop reallocation
error mentioned by Victor
>>>>>>> 1.2098
20000501-15:37 GMT+1 Victor Szakats <info@szelvesz.hu>
* source/rtl/teditor.prg