OSDN Git Service

resolved conflicts for merge of dd4e6571 to master
[android-x86/external-webkit.git] / WebKit / gtk /
drwxr-xr-x   ..
-rw-r--r-- 539402 ChangeLog
-rw-r--r-- 21952 GNUmakefile.am
-rw-r--r-- 790 JSCore.gir.in
-rw-r--r-- 23261 NEWS
drwxr-xr-x - WebCoreSupport
drwxr-xr-x - docs
drwxr-xr-x - gdom
-rw-r--r-- 1390 org.webkitgtk.gschema.xml.in
drwxr-xr-x - po
drwxr-xr-x - resources
drwxr-xr-x - tests
-rw-r--r-- 319 webkit.pc.in
drwxr-xr-x - webkit
-rw-r--r-- 570 webkitmarshal.list