wok-6.x rev 16924
thermald: "hg resolve --all; hg resolve --mark; hg merge" and company...
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Thu Jul 17 21:20:25 2014 +0300 (2014-07-17) |
| parents | 952382c025de 371ffcd4f10c |
| children | 81c2bf22f7bb |
| files | thermald/receipt |
line diff