2011-10-01 19:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* harbour/ChangeLog
    * marked two patches merged with 3.0 branch

harbour/ChangeLog

@@ -16,6 +16,10 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-10-01 19:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * harbour/ChangeLog
+    * marked two patches merged with 3.0 branch
+
 2011-10-01 17:46 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/ChangeLog
     * marked patches merged with 3.0 branch
@@ -798,7 +802,7 @@
       [ So now winuni pkg builder script requires GNU SED tool.]
       Then the corrected .def file can be converted to .lib by
       IMPLIB correctly.
-      [TOMERGE 3.0]
+      [MERGED 3.0]
 
 2011-08-12 02:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbwin/hbwin.hbx
@@ -979,7 +983,7 @@
   * package/winuni/RELNOTES
     ! adjusted hbmk2 cmdline example for building wce apps
       (it gets around the problem fixed in hbmk2 below)
-      [TOMERGE 3.0]
+      [MERGED 3.0]
 
   * utils/hbmk2/hbmk2.prg
     ! fixed to only look for ccprefix/ccpostfix-ed gcc executable

harbour/INSTALL

@@ -535,6 +535,7 @@ HARBOUR
    vxworks  - VxWorks
    symbian  - Symbian OS (experimental)
    minix    - Minix 3 (tested on 3.1.8; earlier releases probably will not work)
+   aix      - IBM AIX
    win      - MS Windows (all flavors)
               (see LINKS section for Win9x requirements)
    wce      - MS Windows CE
@@ -594,11 +595,15 @@ HARBOUR
    gcc      - GNU C
 
    minix
-   -------
+   -----
    gcc      - GNU C
    ack      - Amsterdam Compiler Kit (does not work yet)
    pcc      - Portable C Compiler (experimental)
 
+   aix
+   ---
+   gcc      - GNU C
+
    cygwin
    ------
    gcc      - GNU C
@@ -1457,6 +1462,7 @@ HARBOUR
      minix  -> minix/gcc      x86
      minix  -> minix/clang    x86
      minix  -> minix/ack      x86
+     aix    -> aix/gcc        (CPU cross-builds possible: ppc, ppc64)
      sunos  -> sunos/gcc      (CPU cross-builds possible)
      sunos  -> sunos/sunpro   (CPU cross-builds possible: x86, x86-64, sparc32, sparc64)
    x sunos  -> wce/mingwarm   arm