| commit | e5dc79a4412212d1238e8a4c731b950a9c338711 | |
| author | Ilia Maslakov <il.smind@gmail.com> | |
| Sun, 11 Apr 2010 22:37:06 +0000 (11 22:37 +0000) | ||
| committer | Ilia Maslakov <il.smind@gmail.com> | |
| Tue, 27 Apr 2010 08:15:41 +0000 (27 12:15 +0400) | ||
| tree | 3fdfcd2cf7a441dd1825b5dcbc208a24eb808641 | treesnapshot (tar.gz zip) |
| parent | 7e5c75c906b951bbca8834b760d5037d5793af98 | commitdiff |
added merge mechanism
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>