Mercurial > jhg
diff .settings/org.eclipse.jdt.core.prefs @ 704:7743a9c10bfa
Merge command introduced
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Wed, 14 Aug 2013 20:07:26 +0200 | 
| parents | dbd663faec1f | 
| children | 
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Wed, 14 Aug 2013 20:07:26 +0200 | 
| parents | dbd663faec1f | 
| children |