Merge branch 'master' into autobuild/alpha

Author: c-lipka

changes.txt

@@ -1,6 +1,6 @@
 mesh {
   // Utah teapot with (non-smoothed) triangles
-  #include "..\scenes\advanced\teapot\teapot_tri.inc"
+  #include "../scenes/advanced/teapot/teapot_tri.inc"
   rotate<-90,0,0>
   scale 0.35
 

distribution/platform-specific/windows/Insert Menu/40 - Special shapes/20 - mesh and non CSG shapes/50 - mesh teapot_tri.txt

@@ -1,5 +1,5 @@
 union {
-  #include "..\scenes\objects\chess.inc"
+  #include "../scenes/objects/chess.inc"
   translate<0,6.2,0>  
   scale <1,1,-1>*0.10
   texture{ pigment{ color rgb< 1, 1, 1> } 

distribution/platform-specific/windows/Insert Menu/40 - Special shapes/20 - mesh and non CSG shapes/51 - mesh chess knight and rook.txt

@@ -4,4 +4,4 @@
 #include "screen.inc"
 
 // read the original include file for details 
-// and the sample in 'scenes\screen.pov.' 
+// and the sample in 'scenes/screen.pov.' 

distribution/platform-specific/windows/Insert Menu/A0 - Include files/'screen.inc'.txt

@@ -13,7 +13,7 @@
 
 // This scene makes use of a contrast enhancing filter.
 // For more information, see the demo scene transmitfx.pov
-// located in the folder \scenes\textures\pigments\
+// located in the folder <povray>/scenes/textures/pigments/
 
 // The idea is to create a woodcut look where dark areas are
 // made of thick black stripes and bright areas are made of