Commit graph

38487 commits

Author SHA1 Message Date
Qiwen Zhao
e3735d91b4 am 8e3fa5c1: (-s ours) am 16b9a0ba: (-s ours) am 247aef75: (-s ours) am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.
* commit '8e3fa5c1c400e4ae239fa00c68b7753321965013':
2015-07-15 17:49:02 +00:00
Qiwen Zhao
8ca40c3e9e am ee6c7c0a: (-s ours) am 2bc2b351: (-s ours) am e8622174: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
* commit 'ee6c7c0a141435a8322910c23f0eccecfe3aaa1d':
2015-07-15 17:49:00 +00:00
Qiwen Zhao
633d217d94 am 3a9714ed: (-s ours) am 1d1441d3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
* commit '3a9714ed31096cb65fd8c1c9867a3b3ef3f71ee5':
2015-07-15 17:48:59 +00:00
Qiwen Zhao
38675be227 am 0a0acc3b: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
* commit '0a0acc3b8d8167c2ebedb8f26379a6ee90a2fe0b':
2015-07-15 17:48:59 +00:00
Geoff Mendal
1fc9af7705 am 93193ccf: (-s ours) am 896e619e: (-s ours) am ef1cb855: (-s ours) am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '93193ccf436cb6592de1e9bca5476d6a5278ca48':
  Import translations. DO NOT MERGE
2015-07-15 17:37:19 +00:00
Geoff Mendal
66940fb01e am d534affc: (-s ours) am c9664084: (-s ours) am f72e1202: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'd534affcdb2ebaf497111ccc8c86bdc4d4f67282':
  Import translations. DO NOT MERGE
2015-07-15 17:37:16 +00:00
Geoff Mendal
0184642b72 am 95b0388a: (-s ours) am e45179a2: (-s ours) am a6d84257: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '95b0388afa5b2f9f89b29019316da1a9455fc6c9':
  Import translations. DO NOT MERGE
2015-07-15 17:37:14 +00:00
Geoff Mendal
f81efca101 am 751f64df: (-s ours) am 4a44f433: (-s ours) am d6cba73e: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '751f64dfe244888f0ec3ef69a2c60df292b8fe64':
  Import translations. DO NOT MERGE
2015-07-15 17:37:12 +00:00
Geoff Mendal
417f375851 am c73fabf6: (-s ours) am b8d881f2: (-s ours) am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'c73fabf6080518732c6662df8d227c23847d9831':
  Import translations. DO NOT MERGE
2015-07-15 17:37:10 +00:00
Geoff Mendal
cf090fc76e am 68c112b6: (-s ours) am 63917040: (-s ours) am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '68c112b652194d97dd2b5c488cd2bd118758a0dd':
  Import translations. DO NOT MERGE
2015-07-15 17:37:08 +00:00
Geoff Mendal
a7effd1d40 am 983dcbd1: (-s ours) am cc34158a: (-s ours) am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE
* commit '983dcbd1f858f9bbb5a9781bc9780ece834d70e3':
  Import translations. DO NOT MERGE
2015-07-15 17:37:07 +00:00
Qiwen Zhao
8e3fa5c1c4 am 16b9a0ba: (-s ours) am 247aef75: (-s ours) am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.
* commit '16b9a0ba09380f2c176068005cb28eb1e1d5dbac':
2015-07-15 17:37:05 +00:00
Qiwen Zhao
ee6c7c0a14 am 2bc2b351: (-s ours) am e8622174: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
* commit '2bc2b351ebf504c76be64658a5cf89a9c34046ce':
2015-07-15 17:37:02 +00:00
Qiwen Zhao
3a9714ed31 am 1d1441d3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
* commit '1d1441d32a9b79a114c5d5c8252f3caaf96f81f2':
2015-07-15 17:37:00 +00:00
Geoff Mendal
93193ccf43 am 896e619e: (-s ours) am ef1cb855: (-s ours) am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '896e619e52c8d01317d56f458f3bc7a9c5317e0b':
  Import translations. DO NOT MERGE
2015-07-15 17:17:46 +00:00
Geoff Mendal
d534affcdb am c9664084: (-s ours) am f72e1202: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'c9664084c71c97d9ace82ff5184f02e743273a41':
  Import translations. DO NOT MERGE
2015-07-15 17:17:43 +00:00
Geoff Mendal
95b0388afa am e45179a2: (-s ours) am a6d84257: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'e45179a2afad7c9b679e5242a0606ec342538c82':
  Import translations. DO NOT MERGE
2015-07-15 17:17:39 +00:00
Geoff Mendal
751f64dfe2 am 4a44f433: (-s ours) am d6cba73e: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '4a44f43348b593c2e49d6c7c38aa987ba4cc5d6b':
  Import translations. DO NOT MERGE
2015-07-15 17:17:35 +00:00
Geoff Mendal
c73fabf608 am b8d881f2: (-s ours) am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'b8d881f2505be5511f21ec2de86bc3e8523c3643':
  Import translations. DO NOT MERGE
2015-07-15 17:17:33 +00:00
Geoff Mendal
68c112b652 am 63917040: (-s ours) am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '63917040f1143c036ff480cee3e26790eaddb263':
  Import translations. DO NOT MERGE
2015-07-15 17:17:31 +00:00
Geoff Mendal
983dcbd1f8 am cc34158a: (-s ours) am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE
* commit 'cc34158af0bf5318a33d74fed3e01de32a62149a':
  Import translations. DO NOT MERGE
2015-07-15 17:17:29 +00:00
Qiwen Zhao
16b9a0ba09 am 247aef75: (-s ours) am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.
* commit '247aef7564be66179a988e74bd695c324e36f6dd':
2015-07-15 17:17:27 +00:00
Qiwen Zhao
2bc2b351eb am e8622174: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe
* commit 'e862217461bdf0d460b71d80b800a86be1eb61fc':
2015-07-15 17:17:27 +00:00
Geoff Mendal
896e619e52 am ef1cb855: (-s ours) am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'ef1cb855a84173417089715a595ecba6c6cde4ca':
  Import translations. DO NOT MERGE
2015-07-15 17:08:41 +00:00
Geoff Mendal
c9664084c7 am f72e1202: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'f72e120216d591f6ed1a9aa69d34009d69848108':
  Import translations. DO NOT MERGE
2015-07-15 17:08:40 +00:00
Geoff Mendal
e45179a2af am a6d84257: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'a6d8425760ff3e10f3351545ac7e01e8626fdd8c':
  Import translations. DO NOT MERGE
2015-07-15 17:08:37 +00:00
Geoff Mendal
4a44f43348 am d6cba73e: (-s ours) am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'd6cba73e4c0ec4c4f2f47957873f0983620ff9c4':
  Import translations. DO NOT MERGE
2015-07-15 17:08:35 +00:00
Geoff Mendal
b8d881f250 am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'cce9728e2b838642c85e30978854793b481954d2':
  Import translations. DO NOT MERGE
2015-07-15 17:08:33 +00:00
Geoff Mendal
63917040f1 am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '74d4fdc31c8b3893c498c26e833eabe86f03fb57':
  Import translations. DO NOT MERGE
2015-07-15 17:08:32 +00:00
Geoff Mendal
cc34158af0 am 16ad0293: (-s ours) am 285c9d82: (-s ours) Import translations. DO NOT MERGE
* commit '16ad0293117e18b90d4140a4e3241cd84a1f28a9':
  Import translations. DO NOT MERGE
2015-07-15 17:08:30 +00:00
Qiwen Zhao
247aef7564 am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.
* commit '490701a3feb84f73e5af9a2c4740f4d4be8455b7':
2015-07-15 17:08:30 +00:00
Geoff Mendal
ef1cb855a8 am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '7d5fb3a9430550a3ccf1ed5afd70dbf8cc81574a':
  Import translations. DO NOT MERGE
2015-07-15 16:54:11 +00:00
Geoff Mendal
f72e120216 am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '6aea6b9da7b779ff5f08da631f30bc5f177a3423':
  Import translations. DO NOT MERGE
2015-07-15 16:54:10 +00:00
Geoff Mendal
a6d8425760 am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '1aceaa3c2b19e352cf9f16c73fd03dab881a4434':
  Import translations. DO NOT MERGE
2015-07-15 16:54:09 +00:00
Geoff Mendal
d6cba73e4c am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'c8e261e95bd78ab2a3926d030c0525eba0fd8ca7':
  Import translations. DO NOT MERGE
2015-07-15 16:54:08 +00:00
Geoff Mendal
cce9728e2b am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'cf849b40df13546046d3d7c89dc63c3e8b354976':
  Import translations. DO NOT MERGE
2015-07-15 16:54:06 +00:00
Geoff Mendal
74d4fdc31c am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '29217bcd651d1ab968d01744533aec009fe252da':
  Import translations. DO NOT MERGE
2015-07-15 16:54:05 +00:00
Geoff Mendal
16ad029311 am 285c9d82: (-s ours) Import translations. DO NOT MERGE
* commit '285c9d825d53a76548079ad527c4c79fda69ada1':
  Import translations. DO NOT MERGE
2015-07-15 16:54:03 +00:00
Geoff Mendal
96d0e0194d am 7d5fb3a9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '7d5fb3a9430550a3ccf1ed5afd70dbf8cc81574a':
  Import translations. DO NOT MERGE
2015-07-15 16:53:31 +00:00
Geoff Mendal
6b6db80ca0 am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '6aea6b9da7b779ff5f08da631f30bc5f177a3423':
  Import translations. DO NOT MERGE
2015-07-15 16:53:29 +00:00
Geoff Mendal
e42bad45aa am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '1aceaa3c2b19e352cf9f16c73fd03dab881a4434':
  Import translations. DO NOT MERGE
2015-07-15 16:53:28 +00:00
Geoff Mendal
0283bd9102 am c8e261e9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'c8e261e95bd78ab2a3926d030c0525eba0fd8ca7':
  Import translations. DO NOT MERGE
2015-07-15 16:53:27 +00:00
Geoff Mendal
9519914150 am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'cf849b40df13546046d3d7c89dc63c3e8b354976':
  Import translations. DO NOT MERGE
2015-07-15 16:53:25 +00:00
Geoff Mendal
dbba221709 am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '29217bcd651d1ab968d01744533aec009fe252da':
  Import translations. DO NOT MERGE
2015-07-15 16:53:24 +00:00
Geoff Mendal
3a7194e98e am 285c9d82: (-s ours) Import translations. DO NOT MERGE
* commit '285c9d825d53a76548079ad527c4c79fda69ada1':
  Import translations. DO NOT MERGE
2015-07-15 16:53:22 +00:00
Geoff Mendal
7d5fb3a943 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:48:45 +00:00
Geoff Mendal
6aea6b9da7 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:47:56 +00:00
Geoff Mendal
1aceaa3c2b Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:47:44 +00:00
Geoff Mendal
c8e261e95b Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:46:10 +00:00
Geoff Mendal
cf849b40df Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 16:44:45 +00:00