diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-11-21 13:07:31 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2012-11-21 13:07:31 +0900 |
| commit | e36af707c8a8705ebd19fcc359c51181f7ebd171 (patch) | |
| tree | fbae289dfb76e703f53ace1afea4ebdea7d52b99 /dictionaries | |
| parent | 41a77f9e6ef6470f7f947e08466983c055a516e7 (diff) | |
| parent | b7e6bbaebcfc0707890cd17a15f70688a01217a7 (diff) | |
| download | latinime-e36af707c8a8705ebd19fcc359c51181f7ebd171.tar.gz latinime-e36af707c8a8705ebd19fcc359c51181f7ebd171.tar.xz latinime-e36af707c8a8705ebd19fcc359c51181f7ebd171.zip | |
resolved conflicts for merge of b7e6bbae to master
Change-Id: Ic02809190721472d138532d2189328519117e042
Diffstat (limited to 'dictionaries')
0 files changed, 0 insertions, 0 deletions