Update notes and build instructions

I know Erlang/OTP 18.1 is not available yet but it will fix important
issues in wx (and current maint branch of erlangs github repository works,
and is used for this release).

BUILD.unix

@@ -17,7 +17,8 @@ run all plug-ins and to build an installation package.
 
 - The Wings source files. http://www.wings3d.com
 
-- Erlang/OTP R16B01 or later. http://www.erlang.org
+- Erlang/OTP 18.1 or later. http://www.erlang.org
+-- Preferably compiled against wxWidgets-3.0.2 or later.
 
 - CL. http://github.com/tonyrog/cl
 
@@ -223,11 +224,6 @@ you'll need the following additional software:
 - makeself.sh for building the installation package
   (a self-extractable bzip2 archive). http://megastep.org/makeself
 
-- libjpeg for build the jpeg plug-in. libjpeg is pre-installed in most Linux
-  distributions. You'll probably need to install header files, though, by
-  installing the package libjpg-devel. Otherwise, get the sources from:
-  http://www.ijg.org
-
 Make sure that your current directory is the directory in which the
 sources were unpacked.
 

BUILD.win32

@@ -16,7 +16,7 @@ The following software is needed:
 - MinGW, http://www.mingw.org, including MSYS, http://www.mingw.org/wiki/msys,
   to compile the source code.
 
-- Erlang/Opt R14B01 or later. http://www.erlang.org
+- Erlang/Otp 18.1 or later. http://www.erlang.org
   Include the vcredist packaged with Erlang, in your installation.
   (It is easiest to download the pre-built binaries for Windows.)
 
@@ -25,9 +25,6 @@ The following software is needed:
 Optional software
 =================
 
-- libjpeg for build the jpeg plug-in.
-  http://www.ijg.org
-
 - NSIS 2.02 or higher, an installer/uninstaller maker.
   http://nsis.sf.net.
 
@@ -36,7 +33,6 @@ Installing the software
 
 In general, you should follow the instructions for each package.
 
-
 Setting up the environment
 ==========================
 
@@ -148,7 +144,7 @@ Notes:
     allowing Wings to open up a wings file when it starts.
 
 [3] The "-smp" flag is necessary if you don't have a multi-core/
-    multi-CPU computer and wants to use OpenCL. 
+    multi-CPU computer.
 
 You could also package the command line into a standard windows shortcut.
 

NOTES-2.0

@@ -3,12 +3,14 @@
 - Rewrote to use wx as backend for graphics
   It allows us to use more (native) widgets in the future and
   copy-paste in text widgets, native fonts and so on.
+  Much have been rewritten so much can be broken,
+  please report bugs in the forum.
   [dgud] and [Micheus]
 
 - Removed/Changed some features that was hard to port to wx
--- Setting/removing keyboard shortcuts have change, see help.
--- Preview rendering is always on.
--- Right Click menu icons have been removed.
+   Setting/removing keyboard shortcuts have change, see help.
+   Preview rendering is always on.
+   Right Click menu icons have been removed.
 
 - Changed the installer for all OS'es, to behave more like native apps.
 -- Linux: includes desktop shortcuts with icons.
@@ -17,4 +19,7 @@
 
 - Added edge/hardness/invert command [Mark Whittemore]
 
+- Removed YafRay plugin and added a new YafaRay plugin [oort]
+  Ported all render plugins to use the new gui. [Micheus]
 
+- Added a file merge dialog so the user can choose what to import. [micheus]