| commit | 11d367dae18b2a5f273c87b9cbe1b45aeb906241 | |
| author | Krzysztof Foltman <wdev@foltman.com> | |
| Sun, 25 Jan 2009 01:05:44 +0000 (25 01:05 +0000) | ||
| committer | Krzysztof Foltman <wdev@foltman.com> | |
| Sun, 25 Jan 2009 01:05:44 +0000 (25 01:05 +0000) | ||
| tree | ac2b24559b86d39595bd3426ec6c2d44b4b9e54c | treesnapshot (tar.gz zip) |
| parent | 4b6c37e37ff9ea9c0e1f328a6f4e4662d90ecf14 | commitdiff |
| parent | e037e222d2e237f0b332e4ed287e1a65425e93a3 | commitdiff |
Merge commit 'torbenh/master'
Conflicts:
src/custom_ctl.cpp
Conflicts:
src/custom_ctl.cpp
| src/custom_ctl.cpp | diff1 | diff2 | blobhistory |