054c665009
Merge branch 'master' into f25
2017-11-08 13:00:08 -05:00
b3ae569782
fix merge
2017-10-29 10:39:41 -04:00
a2ce65ede4
Fix the policy templates handling
...
Basically revert my previous commits as the policy templates are
generated during the build. The only thing that we were copying out from
the tarballs was the policy templates documentation, but that one is
generated as well so use that one and remove the policy_templates zip
file from sources
2017-10-25 10:35:45 +02:00
65423256c7
Merge branch 'master' into f25
2017-10-24 17:02:42 -04:00
a408fa31ca
Improve the chromium-latest.py script
...
- Download the policy templates per release channel
- Only run the nacl_versions when not running on python 2.6 as the
toolchain_build modules are not python 2.6 compatible
2017-10-19 14:15:50 +02:00
a6268f10a7
Update the chromium-lastest.py to always download the policy templates
...
They are changing across the releases - always download the latest one.
2017-10-18 13:31:03 +02:00
bde07021e1
Merge branch 'master' into f25
2017-09-22 21:54:12 -04:00
ead805e4a5
Merge branch 'master' into f25
2017-09-13 09:30:22 -04:00
0d47ab0d0b
Merge branch 'master' into f25
2017-08-28 06:27:21 -04:00
00b7151be8
Merge branch 'master' into f25
2017-08-16 17:21:42 -04:00
52e2970033
Merge branch 'master' into f25
2017-08-08 13:45:54 -04:00
f1fb6e46c3
Merge branch 'master' into f25
2017-07-21 14:49:41 -04:00
08ab0f536a
Merge branch 'master' into f25
2017-07-13 14:04:12 -04:00
a4acd898df
Merge branch 'master' into f25
2017-07-13 10:54:19 -04:00
ceba0404d2
Merge branch 'master' into f25
2017-06-26 12:52:28 -04:00
0b28ea473f
Merge branch 'master' into f25
2017-06-16 16:44:20 -04:00
54c2aa8f48
Merge branch 'master' into f25
2017-06-13 13:27:24 -04:00
fa5ac7a8f5
Merge branch 'master' into f25
2017-06-12 17:22:10 -04:00
7f90530e56
Merge branch 'master' into f25
2017-06-12 16:01:22 -04:00
9ca4d735ac
Merge branch 'master' into f25
2017-06-12 15:13:51 -04:00
1eb003b080
Merge branch 'master' into f25
2017-05-16 10:40:50 -04:00
1c1a73dfe4
Merge branch 'master' into f25
2017-05-16 08:43:55 -04:00
f3715e384b
Merge branch 'master' into f25
2017-03-30 14:21:43 -04:00
84d38d9c65
Merge branch 'master' into f25
2017-03-26 11:17:04 -04:00
a7762b31a4
Merge branch 'master' into f25
2017-03-21 20:28:17 -04:00
7149b55c1f
Merge branch 'master' into f25
2017-03-21 20:10:31 -04:00
73f769d006
Merge branch 'master' into f25
2017-02-23 17:31:56 -05:00
0d5141b5af
Merge branch 'master' into f25
2017-02-13 14:46:43 -05:00
740c5db5be
Merge branch 'master' into f25
2017-02-10 15:35:41 -05:00
dae8e5080e
Merge branch 'master' into f25
2017-02-10 15:30:53 -05:00
1234a68db5
Merge branch 'master' into f25
2016-12-13 14:31:11 -05:00
c77fc327b9
Merge branch 'master' into f25
2016-12-12 16:42:41 -05:00
4fee8c6265
Merge branch 'master' into f25
2016-11-04 13:33:38 -04:00
f611c2c3c1
Merge branch 'master' into f25
2016-11-03 13:39:33 -04:00
2893cb14bc
Merge branch 'master' into f25
2016-11-02 11:48:12 -04:00
654376e00c
Merge branch 'master' into f25
2016-10-27 09:27:57 -04:00
b354894644
Merge branch 'master' into f25
2016-09-30 14:04:59 -04:00
578062b2bb
Merge branch 'master' into f25
2016-09-20 12:51:05 -04:00
0eca3e3d42
Merge branch 'master' into f25
2016-09-14 10:22:08 -04:00
4181b6cea5
Merge branch 'master' into f25
2016-09-09 09:09:51 -04:00
72ad576531
Merge branch 'master' into f25
2016-09-07 15:28:00 -04:00
4f7db46765
Merge branch 'master' into f25
2016-08-18 09:38:05 -04:00
aaa85cda51
Merge branch 'master' into f25
2016-08-16 15:31:34 -04:00
34ca4a83ad
Merge branch 'master' into f25
2016-08-16 09:19:27 -04:00
d885ae2cab
Merge branch 'master' into f25
2016-08-15 16:33:17 -04:00
8e523c10d3
Merge branch 'master' into f25
2016-08-15 14:15:46 -04:00
6568852684
Merge branch 'master' into f25
2016-08-08 13:38:15 -04:00
08b8514222
trivial: Fix up the <translation> tag in the AppData file
2016-08-08 16:53:54 +01:00
Tom Callaway
Tomas Popela
Richard Hughes