aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 3c61126e: am 6b98419e: am e193c525: Revert Ida230ca42 and I6adf7d08f.Yuichiro Hanada2013-09-260-0/+0
|\ | | | | | | * commit '3c61126e4d05bb774568e3262ed3761a66d38715':
| * am 6b98419e: am e193c525: Revert Ida230ca42 and I6adf7d08f.Yuichiro Hanada2013-09-260-0/+0
| |\ | | | | | | | | | * commit '6b98419ee17f7a534df31892055a0d710e55121f':
* | | am d607a368: am 4754ac4c: am ef073f40: Use PrioritizedSerialExecutor instead ↵Yuichiro Hanada2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | of ReentrantReadWriteLock. * commit 'd607a368ffb676284fe42adee4a08ac780135fb9':
| * | am 4754ac4c: am ef073f40: Use PrioritizedSerialExecutor instead of ↵Yuichiro Hanada2013-09-260-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | ReentrantReadWriteLock. * commit '4754ac4c65d88dd1f7127da3cc968350bb662116':
* | | | am 50e7181d: am bc435b78: am 40e91e45: Merge "Check the version of format ↵Ken Wakasa2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | options before writing." * commit '50e7181d40e19efcf968f362e942013d859df19e':
| * | | am bc435b78: am 40e91e45: Merge "Check the version of format options before ↵Ken Wakasa2013-09-260-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | writing." * commit 'bc435b788c20b167c210bfb586b1dafb0e67aab1':
* | | | | am 31fe08e9: am a01e18d5: am e531c224: Move a flag about switching dynamic ↵Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | update to java. * commit '31fe08e9c3802c0dc0667cc075428a4b53562790':
| * | | | am a01e18d5: am e531c224: Move a flag about switching dynamic update to java.Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | * commit 'a01e18d5819360e7bf3d6f1b42f5f0b56a9866a1':
* | | | | | am 1d9692ce: am 2e4a9177: am 5bf96a8f: Merge "Add AsyncResultHolder."Satoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '1d9692ce66860e307445facade1a71a9e15642f7':
| * | | | | am 2e4a9177: am 5bf96a8f: Merge "Add AsyncResultHolder."Satoshi Kataoka2013-09-260-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | * commit '2e4a917711593c4fa15523b6a7bfb4a696f4802e':
* | | | | | | am e7f28f4e: am 0f2fe443: am 21066960: Merge "Fix: ExtendableBuffer"Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e7f28f4e60e6b7aa38767e9a71684a5beb90896e':
| * | | | | | am 0f2fe443: am 21066960: Merge "Fix: ExtendableBuffer"Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '0f2fe443a134d6e298a14e46c9d5bcc6d6709f36':
* | | | | | | | am 7f23c1f3: am 5599b04a: am 21661706: Merge "Implement split and create ↵Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | node methods." * commit '7f23c1f375795f1411d9d9886f8f657e75121fb3':
| * | | | | | | am 5599b04a: am 21661706: Merge "Implement split and create node methods."Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5599b04a0b7ed3fbc07f9b51518c67f884b85618':
* | | | | | | | | am 4e7e4a02: am ee98aa17: am c5f35a9c: Merge "Calculate parent offset from ↵Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the head of moved node." * commit '4e7e4a02decbe95b6a03e05f98924fa7d7dfb15c':
| * | | | | | | | am ee98aa17: am c5f35a9c: Merge "Calculate parent offset from the head of ↵Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moved node." * commit 'ee98aa17a5667ef1bf7747c8e8c94a0c1b84c1fe':
* | | | | | | | | | am 7e2ed3b9: am d20bee71: am 1d4a07f6: Merge "Re-call getBuffer after ↵Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | writing in bigram/shortcut policy." * commit '7e2ed3b9d7509d7f09d6ae38059954321293c5b3':
| * | | | | | | | | am d20bee71: am 1d4a07f6: Merge "Re-call getBuffer after writing in ↵Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bigram/shortcut policy." * commit 'd20bee711fd77588c114fb97f5c48a375b16436d':
* | | | | | | | | | | am ef1487ed: am 111e37ad: am e3e2b03d: Merge "Implement create children ↵Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | array and add child method." * commit 'ef1487edc46c4ca9ef5e606c6ff4142eaf5580b6':
| * | | | | | | | | | am 111e37ad: am e3e2b03d: Merge "Implement create children array and add ↵Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | child method." * commit '111e37ad5db849e65e20037e1408658f3cebf28e':
* | | | | | | | | | | | am 779f99a0: am 011ce47f: am be963611: Merge "Check contents in user history ↵Satoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionary tests" * commit '779f99a0f17d1aee32e4910f6c45b45589cc99e4':
| * | | | | | | | | | | am 011ce47f: am be963611: Merge "Check contents in user history dictionary ↵Satoshi Kataoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests" * commit '011ce47f128c212682d4d3bded81fda761559334':
* | | | | | | | | | | | | am 227477f8: am ecdde8ee: am 5e797bd7: Merge "Implement update node ↵Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | probability method." * commit '227477f81d7c24a140d7ebc4a234f1f03ab19e1b':
| * | | | | | | | | | | | am ecdde8ee: am 5e797bd7: Merge "Implement update node probability method."Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ecdde8ee859d21bf7a9b7a8a92d291803aeace9d':
* | | | | | | | | | | | | | am 552a74c4: am 45bede32: am 70e81af7: Hide physical structure of the ↵Yuichiro Hanada2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionary from BinaryDictEncoderUtils. * commit '552a74c47d31cbb5bb523d1e44f6206fe86c7f0b':
| * | | | | | | | | | | | | am 45bede32: am 70e81af7: Hide physical structure of the dictionary from ↵Yuichiro Hanada2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BinaryDictEncoderUtils. * commit '45bede32b9db7906dd735ec3dcca6df50dac8fa0':
* | | | | | | | | | | | | | | am 00b39433: am e4d8dd65: am cc2751ba: Make commitCurrentAutoCorrection ↵Yuichiro Hanada2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | asynchronous. * commit '00b39433afaa6fd2684ad38910e53ceb7ae1989e':
| * | | | | | | | | | | | | | am e4d8dd65: am cc2751ba: Make commitCurrentAutoCorrection asynchronous.Yuichiro Hanada2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e4d8dd65a619f5e1e4076c854e032469fb8b090c':
* | | | | | | | | | | | | | | | am b59e8066: am a14332f5: am 37e0fd2f: Revise TODO comment for I823912e3979829a.Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b59e806648cbc3d7a08ae94659f1a961982e92e3':
| * | | | | | | | | | | | | | | am a14332f5: am 37e0fd2f: Revise TODO comment for I823912e3979829a.Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a14332f537be29ceb651e804c835c1a12424e424':
* | | | | | | | | | | | | | | | | am b023fb67: am 1d818b06: am 773f2272: Fix: wrong locking order.Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b023fb67a1d14a83512b37a5e445b07e34912597':
| * | | | | | | | | | | | | | | | am 1d818b06: am 773f2272: Fix: wrong locking order.Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1d818b06fef962003221a74ecbb0d9c525cd6968':
* | | | | | | | | | | | | | | | | | am fac0fcd4: am 8a325042: am e7ac9003: Merge "Write forgetting curve flag."Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fac0fcd4dc33ccbc14c2abd67c03a975e4a4b61d':
| * | | | | | | | | | | | | | | | | am 8a325042: am e7ac9003: Merge "Write forgetting curve flag."Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a325042ddfde71e0f9dbc712180803f532c7a7d':
* | | | | | | | | | | | | | | | | | | am 3a16edf9: am 18713ba4: am 563bcb51: Rename write(|Signed)VariableAddress ↵Yuichiro Hanada2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and to write(|Signed)ChildrenPosition. * commit '3a16edf9079395c505043bb06fec85d8774f814a':
| * | | | | | | | | | | | | | | | | | am 18713ba4: am 563bcb51: Rename write(|Signed)VariableAddress and to ↵Yuichiro Hanada2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write(|Signed)ChildrenPosition. * commit '18713ba45c222e54c4c5a851ab98c40d13a98d0e':
* | | | | | | | | | | | | | | | | | | | am caa74795: am a31e41f5: am 6156892b: Add computeChildrenPosition and ↵Yuichiro Hanada2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplify writePlacedNode. * commit 'caa74795fa81eead954be26b811e4a3ac43bbb1b':
| * | | | | | | | | | | | | | | | | | | am a31e41f5: am 6156892b: Add computeChildrenPosition and simplify ↵Yuichiro Hanada2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | writePlacedNode. * commit 'a31e41f5383f6805179a9fe651dde871c2e8bd55':
* | | | | | | | | | | | | | | | | | | | | am bba505f6: am b41d66d7: am 3fbc5ef1: Implement inserting new node into ↵Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PtNode array. * commit 'bba505f6b80ace56121fe20082642ec7a053dea7':
| * | | | | | | | | | | | | | | | | | | | am b41d66d7: am 3fbc5ef1: Implement inserting new node into PtNode array.Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b41d66d71879e0a0a1159b0527a84150b82aed83':
* | | | | | | | | | | | | | | | | | | | | | am e0a246e4: am 6d0b1c8c: am 142511c4: Merge "Add margin to the label of ↵Satoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | language" * commit 'e0a246e434066eb683100964132a675ca0763c01':
| * | | | | | | | | | | | | | | | | | | | | am 6d0b1c8c: am 142511c4: Merge "Add margin to the label of language"Satoshi Kataoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d0b1c8cd59b196856eca72347936b2b5f6b54e7':
* | | | | | | | | | | | | | | | | | | | | | | am f2132283: am 9202af7f: am 4aad381f: Merge "Optimize tablet layout"Satoshi Kataoka2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2132283d393e121ac3accfabab529daaa6750da':
| * | | | | | | | | | | | | | | | | | | | | | am 9202af7f: am 4aad381f: Merge "Optimize tablet layout"Satoshi Kataoka2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9202af7f348e28532c0dd2620dc76f65755f9383':
* | | | | | | | | | | | | | | | | | | | | | | | am 0383e1a0: am ae7e7e0e: am 40182c73: Merge "Compute probability using ↵Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | structure policy." * commit '0383e1a0f8a7c4617aeefcb2a74342792c5b1004':
| * | | | | | | | | | | | | | | | | | | | | | | am ae7e7e0e: am 40182c73: Merge "Compute probability using structure policy."Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ae7e7e0e4e0ebd4f5da793ee82bedf1edbd5914f':
* | | | | | | | | | | | | | | | | | | | | | | | | am b1703681: am db1e9eea: am 48554e22: Merge "Add node flags creating methods."Keisuke Kuroyanagi2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b170368181d94395c3d372c2d98e12fa77aa4d00':
| * | | | | | | | | | | | | | | | | | | | | | | | am db1e9eea: am 48554e22: Merge "Add node flags creating methods."Keisuke Kuroyanagi2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db1e9eeab7325cd0c62e0d1cd2c5851df8400aa5':
* | | | | | | | | | | | | | | | | | | | | | | | | | am 27522506: (-s ours) am 6c6914d2: (-s ours) am a8550e22: (-s ours) Merge ↵Baligh Uddin2013-09-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" * commit '27522506532eb1395546b67b5dab9cd662d1e027':
| * | | | | | | | | | | | | | | | | | | | | | | | | am 6c6914d2: (-s ours) am a8550e22: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-09-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" * commit '6c6914d24319d291d5f523928bf28c477cd8e57e':