OSDN Git Service

resolved conflicts for merge of 1457b739 to master
[android-x86/external-webkit.git] / WebKit /
drwxr-xr-x   ..
-rw-r--r-- 4334 Android.mk
-rw-r--r-- 2491 CMakeLists.txt
-rw-r--r-- 119868 ChangeLog
drwxr-xr-x - English.lproj
-rw-r--r-- 1313 LICENSE
-rw-r--r-- 27 Makefile
-rw-r--r-- 21858 StringsNotToBeLocalized.txt
drwxr-xr-x - WebKit.xcodeproj
drwxr-xr-x - android
drwxr-xr-x - cf
drwxr-xr-x - chromium
drwxr-xr-x - efl
drwxr-xr-x - gtk
drwxr-xr-x - haiku
drwxr-xr-x - mac
drwxr-xr-x - qt
drwxr-xr-x - scripts
drwxr-xr-x - win
drwxr-xr-x - wince
drwxr-xr-x - wx