| commit | 00458b81feb5bed045aec393d7ea911fd470d8c0 | |
| author | Plamen Petrov <pvp@tk.ru.acad.bg> | |
| Tue, 20 May 2008 14:24:40 +0000 (20 17:24 +0300) | ||
| committer | Plamen Petrov <pvp@tk.ru.acad.bg> | |
| Tue, 20 May 2008 14:24:40 +0000 (20 17:24 +0300) | ||
| tree | ad74c9529f229895410fa1609ef538e93246362d | treesnapshot (tar.gz zip) |
| parent | 36a1032b1c7396cce0d625d025010f77bceb89f0 | commitdiff |
| parent | e6f3fae79d4029bb320cc0e741edb1ccab7ff801 | commitdiff |
Merge branch 'dev'
Conflicts:
configure.in.in
src/main.cpp
Conflicts:
configure.in.in
src/main.cpp