| commit | 4e3640c5f4beb4e1cdb6db67401a92454765a793 | |
| author | Mauro Iazzi <mauro.iazzi@gmail.com> | |
| Sun, 11 Oct 2009 22:58:55 +0000 (12 00:58 +0200) | ||
| committer | Mauro Iazzi <mauro.iazzi@gmail.com> | |
| Sun, 11 Oct 2009 22:58:55 +0000 (12 00:58 +0200) | ||
| tree | e2539047774b46c2b8010fc7134d959c8ab96626 | treesnapshot (tar.gz zip) |
| parent | 2c7a913668ba60d1c5b4d3dc5a63990c58b2269f | commitdiff |
| parent | 0ca29fa1cc5d22737c2b8abacee7b80785d63476 | commitdiff |
Merge branch 'master' of ssh://repo.or.cz/srv/git/lqt
Conflicts:
common/lqt_common.cpp
why did I ever do this?
NOTE TO SELF: never again edit the same files on two
different computers at the same time
Conflicts:
common/lqt_common.cpp
why did I ever do this?
NOTE TO SELF: never again edit the same files on two
different computers at the same time
| common/lqt_common.cpp | diff1 | diff2 | blobhistory |
| common/lqt_common.hpp | diff1 | diff2 | blobhistory |