diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-10-09 08:03:58 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-10-09 08:03:58 +0200 |
| commit | 318cdd1f24cd663702222cc182ae2ccac5e76870 (patch) | |
| tree | 8d18a55d7327e43da1fd81e3df6a8db07e0a1846 /src/object.cpp | |
| parent | 214b56077a7e5d12813c8034013171d33283566c (diff) | |
| parent | ef8db789a1c97152e84ff03c9a7f6e1e77d95981 (diff) | |
Merge branch 'maint'
* maint:
Version macros added
Conflicts:
builds/msvc/platform.hpp
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/object.cpp')
0 files changed, 0 insertions, 0 deletions