From: Daniel Kochmański <daniel@turtleware.eu>
Date: Fri, 28 Aug 2015 11:17:07 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Url: http://git.pulsar-zone.net/?a=commitdiff_plain;h=a94a5c2e1e6b24627eeab651729e861b9c27ee00;p=ecl.git

Merge branch 'master' into develop
---

a94a5c2e1e6b24627eeab651729e861b9c27ee00
diff --cc CHANGELOG
index 0a4a071,d778a45..3d81f02
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -19,15 -19,15 +19,15 @@@
  
    - In Windows ECL comes with bytecodes compiler by default, because C
      compilers are normally not available. Unfortunately several libraries
-     out there are not prepared for this.  If you plan to use quicklisp
-     and have a C compiler accessible to ECL, you may use
+     out there are not prepared for this.  If you plan to use quicklisp and
+     have a C compiler accessible to ECL, you may use
      (ext:install-c-compiler) to switch back to the Lisp-to-C compiler.
  
 -  - In order to test a package, programmer has to install ECL on a desired
 -    destination (specified with "--prefix" parameter given to the configure
 +  - In order to test package programmer has to install ECL on desired
 +    destination (specified with "--prefix" parameter given to configure
      script).
      
- * Pending changes since 15.3.7
+ * 16.0.0 changes since 15.3.7
  ** API changes
  
     - There is no UFFI nickname for FFI package - we piggyback on