Rolled file back to version from master, due to improper merge
[supertux.git] / src / object / floating_text.hpp
2009-11-17 Ingo RuhnkeMerged changes from branches/supertux-milestone2-grumbe...