Merge branch '3.2' into 3.3

This commit is contained in:
Danny Rawlins 2017-01-04 18:07:04 +11:00
commit 386f8c6435
3 changed files with 10 additions and 4 deletions

View File

@ -151,14 +151,14 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/emulated_devices/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/iPhone6-portrait.svg
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/es_tree/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/es_tree/es_tree_module.js
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/formatter_worker.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/gonzales/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/gonzales/gonzales_module.js
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/heap_snapshot_worker.js
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspector.html
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspector.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/layer_viewer/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/layer_viewer/layer_viewer_module.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/layers/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/layers/layers_module.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/network/
@ -173,6 +173,8 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/screencast/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/screencast/screencast_module.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/security/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/security/security_module.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/services/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/services/services_module.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/settings/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/settings/settings_module.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/snippets/
@ -182,6 +184,10 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/source_frame/
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sources/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/sources/sources_module.js
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/temp_storage_shared_worker.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/terminal/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/terminal/terminal_module.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/text_editor/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/text_editor/text_editor_module.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/timeline/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/timeline/timeline_module.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/timeline_model/

View File

@ -1,4 +1,4 @@
07c7231180b9122d5389e77536a7271b chromium-54.0.2840.100.tar.xz
1bbfd501e662a324b5749ceaad8ab3b4 chromium-55.0.2883.103.tar.xz
b527005e021b14869a669e42c46b661d chromium.desktop
64968626706b07721983ac59fb3babbf chromium.sh
3354997dd0bfde3443499133a6e16a85 last-commit-position.patch

View File

@ -5,7 +5,7 @@
# Depends on: dbus-glib gperf gtk libevent libexif libgcrypt mesa3d ninja nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt xorg-libxtst yasm
name=chromium
version=54.0.2840.100
version=55.0.2883.103
release=1
source=(http://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz \
last-commit-position.patch $name.sh $name.desktop)