| commit | 9df15b8bff3e41dac8ec19f1b0ad4f47e6b57d73 | [log] [tgz] |
|---|---|---|
| author | Leo L. Schwab <ewhac@google.com> | Wed Apr 18 15:26:10 2012 -0700 |
| committer | Leo L. Schwab <ewhac@google.com> | Wed Apr 18 15:26:10 2012 -0700 |
| tree | 1c8f9e840e9bf10251bd9c2ce402710603faee54 | |
| parent | dc303e000745529d25f863fefb608e05f9f5a090 [diff] | |
| parent | 058533a56d34c839db384d5081208db36da41a17 [diff] |
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