| commit | 12422cb356e05fd3454ee18ffa73df0b723d8e25 | [log] [tgz] |
|---|---|---|
| author | Florian Loitsch <florian@loitsch.com> | Sun Jan 12 17:29:05 2014 +0100 |
| committer | Florian Loitsch <florian@loitsch.com> | Sun Jan 12 17:29:05 2014 +0100 |
| tree | 6cbae5144b61d6dc3ec16711ecf12f4bc4de42da | |
| parent | 079bf73e4413202cceb8593034c38aee009193fd [diff] | |
| parent | 3833c5ca25dcf026b46e29df8c18efa97ed39a3e [diff] |
Merge branch 'improved_scons' into branch_v2.0 Conflicts: Changelog SConstruct