First import
..
...
...
...
...
Changed Emitter constructor
...
...
..
Emitter changed
Emitter files changed
Emitter changed
Emitter::Focus changes
...
 ...
...
...
System, Emitter and Particle's files modified
Merge branch 'master' of bitbucket.org:jlavado/ParticleEngine

Conflicts:
	include/MPE/Emitter.hpp
	include/MPE/Particle.hpp
	tags
	types_c.taghl