| commit | d236ba9726589e9fd5905e20756c2eb0e7c6f4c2 | |
| author | Artyom Olshevskiy <siasia@siasia.(none)> | |
| Thu, 20 May 2010 23:58:17 +0000 (21 02:58 +0300) | ||
| committer | Artyom Olshevskiy <siasia@siasia.(none)> | |
| Thu, 20 May 2010 23:58:17 +0000 (21 02:58 +0300) | ||
| tree | b50a7e89a115f1f6028d9f284d30f2eed998fb38 | treesnapshot (tar.gz zip) |
| parent | 7a56efe8efef910664ba5a10e15de04213b41015 | commitdiff |
| parent | 260b9b3febbbe8320aa11946dd2e2c7c98b8d184 | commitdiff |
Merge branch 'master' of ssh://repo.or.cz/srv/git/dataminer
Conflicts:
src/main/scala/net/dataminer/model/Miner.scala
Conflicts:
src/main/scala/net/dataminer/model/Miner.scala