tree 1c8f9e840e9bf10251bd9c2ce402710603faee54
parent dc303e000745529d25f863fefb608e05f9f5a090
parent 058533a56d34c839db384d5081208db36da41a17
author Leo L. Schwab <ewhac@google.com> 1334787970 -0700
committer Leo L. Schwab <ewhac@google.com> 1334787970 -0700

Merge branch 'upstream'

Integrate from SVN upstream, version 1396.

All conflicts resolved by hand.

Conflicts:
	src/libprojectM/MilkdropPresetFactory/BuiltinFuncs.hpp
	src/libprojectM/MilkdropPresetFactory/Expr.cpp
	src/libprojectM/Renderer/Renderer.cpp
	src/libprojectM/config.inp.in
	src/libprojectM/projectM.cpp