Remi Beges a72d388c05 Merge remote-tracking branch 'upstream/master' ... Conflicts: include/Nazara/Noise/NoiseMachine.hpp src/Nazara/Noise/ComplexNoiseBase.cpp src/Nazara/Noise/NoiseMachine.cpp Former-commit-id: 54af2e19e336cfacee63cabe785d7b05fa392b53		2012-10-05 17:53:41 +02:00
..
Nazara	Merge remote-tracking branch 'upstream/master'	2012-10-05 17:53:41 +02:00