From 4013e216a5c75b0ed75b3a8d690a42c041df19e2 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 28 Oct 2008 02:54:35 +0000
Subject: [PATCH] two changes marked as TOMERGE 1.0

---
 harbour/ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5119673894..316181efcf 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -155,12 +155,14 @@
             dangerous than it's useful. It'd vote for 
             a compiler warnings switch for any of it's 
             occurences.
+      [TOMERGE 1.0]
 
   * source/rtl/tbcolumn.prg
   * source/rtl/tget.prg
   * source/rtl/tbrowse.prg
   * contrib/xhb/hbcompat.ch
     ! Fixed '&&' being used instead of '.AND.' in #ifs.
+      [TOMERGE 1.0]
 
   * source/rdd/hbsix/sxini.prg
   * source/rdd/hbsix/sxcompat.prg