Lynix 780da2cfa5 Resolved conflicts ... Former-commit-id: 4bd4e4f8435d701d16d3864dd030a6c1cff48c47		2012-12-02 21:49:14 +01:00
..
Abstract2DNoise.hpp	Replaced templates by float	2012-10-27 18:59:39 +02:00
Abstract3DNoise.hpp	Replaced templates by float	2012-10-27 18:59:39 +02:00
Abstract4DNoise.hpp	Replaced templates by float	2012-10-27 18:59:39 +02:00
ComplexNoiseBase.hpp	Minor fixes	2012-12-01 10:07:41 +01:00
Config.hpp	Changed all the files encoding to UTF-8	2012-08-10 03:21:37 +02:00
Debug.hpp	Changed all the files encoding to UTF-8	2012-08-10 03:21:37 +02:00
DebugOff.hpp	Changed all the files encoding to UTF-8	2012-08-10 03:21:37 +02:00
FBM2D.hpp	Minor fixes	2012-12-01 10:07:41 +01:00
FBM3D.hpp	Minor fixes	2012-12-01 10:07:41 +01:00
FBM4D.hpp	Minor fixes	2012-12-01 10:07:41 +01:00
HybridMultiFractal3D.hpp	Minor fixes	2012-12-01 10:07:41 +01:00
HybridMultiFractal4D.hpp	Minor fixes	2012-12-01 10:07:41 +01:00
HybridMultifractal2D.hpp	Minor fixes	2012-12-01 10:07:41 +01:00
MappedNoiseBase.hpp	Replaced templates by float	2012-10-27 18:59:39 +02:00
Noise.hpp	Minor fixes	2012-12-01 10:07:41 +01:00
NoiseBase.hpp	Minor fixes	2012-12-01 10:07:41 +01:00
Perlin2D.hpp	Minor fixes	2012-12-01 10:07:41 +01:00
Perlin3D.hpp	Minor fixes	2012-12-01 10:07:41 +01:00
Perlin4D.hpp	Minor fixes	2012-12-01 10:07:41 +01:00
Simplex2D.hpp	Minor fixes	2012-12-01 10:07:41 +01:00
Simplex3D.hpp	Minor fixes	2012-12-01 10:07:41 +01:00
Simplex4D.hpp	Minor fixes	2012-12-01 10:07:41 +01:00