From 4d6b739524a1809ae159f1121a1c38b5dd78a493 Mon Sep 17 00:00:00 2001 From: Taeyoung Son Date: Thu, 29 May 2014 21:04:38 -0700 Subject: Revert "Revert "Merge branch 'mw' into buildFramework"" This reverts commit 1bdab68a99c044c6545bd488e94c5c2172b39566. Change-Id: I247ee59eecc3e8d92b25c2315f41f0a9990322d2 --- .../OSGI-INF/l10n/bundle.properties | 2 + .../OSGI-INF/l10n/bundle.properties | 30 ++++++++++ org.tizen.common.connection/build.properties | 5 +- org.tizen.common.connection/icons/emulator.png | Bin 0 -> 3422 bytes .../icons/emulator_lock.png | Bin 0 -> 3488 bytes .../icons/emulator_offline.png | Bin 0 -> 3465 bytes .../icons/emulator_suspend.png | Bin 0 -> 3440 bytes .../OSGI-INF/l10n/bundle.properties | 22 +++++++ org.tizen.common.gom/META-INF/MANIFEST.MF | 4 +- .../OSGI-INF/l10n/bundle.properties | 5 ++ .../icons/default_project_icon.png | Bin 0 -> 3394 bytes .../OSGI-INF/l10n/bundle.properties | 2 + .../OSGI-INF/l10n/bundle.properties | 2 + .../src/org/tizen/sdblib/DeviceConstants.java | 4 +- org.tizen.common.sign/META-INF/MANIFEST.MF | 2 - .../OSGI-INF/l10n/bundle.properties | 4 ++ org.tizen.common.ui/META-INF/MANIFEST.MF | 2 - .../OSGI-INF/l10n/bundle.properties | 13 +++++ org.tizen.common.ui/icons/16_IDE_icon.png | Bin 0 -> 3614 bytes org.tizen.common.ui/images/default_icon.png | Bin 0 -> 4479 bytes org.tizen.common.ui/images/list_viewer_bg_01.png | Bin 0 -> 17809 bytes org.tizen.common.ui/images/new_wiz.png | Bin 0 -> 7888 bytes org.tizen.common.ui/images/tree_viewer_bg_01.png | Bin 0 -> 18851 bytes .../images/wizard_background_image.png | Bin 0 -> 45208 bytes org.tizen.common.ui/resources/tips/commandbar.html | 64 +++++++++++++++++++++ .../OSGI-INF/l10n/bundle.properties | 2 + org.tizen.common.verrari.realm/build.properties | 4 +- .../OSGI-INF/l10n/bundle.properties | 2 + org.tizen.common.verrari/build.properties | 4 +- org.tizen.common/META-INF/MANIFEST.MF | 4 +- org.tizen.common/OSGI-INF/l10n/bundle.properties | 32 +++++++++++ org.tizen.common/build.properties | 3 +- .../org/tizen/common/TizenPlatformConstants.java | 4 ++ package/changelog | 3 + package/pkginfo.manifest | 2 +- 35 files changed, 199 insertions(+), 22 deletions(-) create mode 100755 org.tizen.common.builder/OSGI-INF/l10n/bundle.properties create mode 100755 org.tizen.common.connection/OSGI-INF/l10n/bundle.properties create mode 100755 org.tizen.common.connection/icons/emulator.png create mode 100755 org.tizen.common.connection/icons/emulator_lock.png create mode 100755 org.tizen.common.connection/icons/emulator_offline.png create mode 100755 org.tizen.common.connection/icons/emulator_suspend.png create mode 100755 org.tizen.common.externals/OSGI-INF/l10n/bundle.properties create mode 100755 org.tizen.common.gom/OSGI-INF/l10n/bundle.properties create mode 100755 org.tizen.common.gom/icons/default_project_icon.png create mode 100755 org.tizen.common.project/OSGI-INF/l10n/bundle.properties create mode 100755 org.tizen.common.sdblib/OSGI-INF/l10n/bundle.properties create mode 100755 org.tizen.common.sign/OSGI-INF/l10n/bundle.properties create mode 100755 org.tizen.common.ui/OSGI-INF/l10n/bundle.properties create mode 100755 org.tizen.common.ui/icons/16_IDE_icon.png create mode 100755 org.tizen.common.ui/images/default_icon.png create mode 100755 org.tizen.common.ui/images/list_viewer_bg_01.png create mode 100755 org.tizen.common.ui/images/new_wiz.png create mode 100755 org.tizen.common.ui/images/tree_viewer_bg_01.png create mode 100755 org.tizen.common.ui/images/wizard_background_image.png create mode 100755 org.tizen.common.ui/resources/tips/commandbar.html create mode 100755 org.tizen.common.verrari.realm/OSGI-INF/l10n/bundle.properties create mode 100755 org.tizen.common.verrari/OSGI-INF/l10n/bundle.properties create mode 100755 org.tizen.common/OSGI-INF/l10n/bundle.properties diff --git a/org.tizen.common.builder/OSGI-INF/l10n/bundle.properties b/org.tizen.common.builder/OSGI-INF/l10n/bundle.properties new file mode 100755 index 000000000..5325935a8 --- /dev/null +++ b/org.tizen.common.builder/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,2 @@ +Bundle-Vendor = The Linux Foundation +Bundle-Name = Tizen Common Builder diff --git a/org.tizen.common.connection/OSGI-INF/l10n/bundle.properties b/org.tizen.common.connection/OSGI-INF/l10n/bundle.properties new file mode 100755 index 000000000..ac409a79a --- /dev/null +++ b/org.tizen.common.connection/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,30 @@ +Bundle-Vendor = The Linux Foundation +Bundle-Name = Tizen Common Connection + +view.category = Tizen +view.connectionExplorer = Connection Explorer +view.log = Log + +properties.page.info = Info +properties.page.permission = Permission + +connectionexplorer.name = Connection Explorer +log.name = Log + +command.category = Connection Explorer +command.delete.name = Delete +command.delete.description = Delete a file or folder on the connected target +command.rename.name = Rename +command.rename.description = Rename a file or folder on the connected target +command.refresh.name = Refresh +command.refresh.description = Refresh contents of the connected target +command.property.name = Properties +command.property.description = View properties for a selected file or folder + +context.delete.name = Delete +context.rename.name = Rename +context.refresh.name = Refresh +context.properties.name = Properties + +extension.name = Connection Resource Drop +extension-point.name = tools \ No newline at end of file diff --git a/org.tizen.common.connection/build.properties b/org.tizen.common.connection/build.properties index 627b336d6..7f3c41f69 100644 --- a/org.tizen.common.connection/build.properties +++ b/org.tizen.common.connection/build.properties @@ -6,9 +6,8 @@ bin.includes = META-INF/,\ icons/,\ about.html,\ about_files/,\ - OSGI-INF/,\ - OSGI-INF/l10n/bundle.properties,\ schema/,\ - lib/ + lib/,\ + OSGI-INF/ jars.compile.order = .,\ sdblib.jar diff --git a/org.tizen.common.connection/icons/emulator.png b/org.tizen.common.connection/icons/emulator.png new file mode 100755 index 000000000..03fa5f023 Binary files /dev/null and b/org.tizen.common.connection/icons/emulator.png differ diff --git a/org.tizen.common.connection/icons/emulator_lock.png b/org.tizen.common.connection/icons/emulator_lock.png new file mode 100755 index 000000000..f7120c644 Binary files /dev/null and b/org.tizen.common.connection/icons/emulator_lock.png differ diff --git a/org.tizen.common.connection/icons/emulator_offline.png b/org.tizen.common.connection/icons/emulator_offline.png new file mode 100755 index 000000000..be75b316d Binary files /dev/null and b/org.tizen.common.connection/icons/emulator_offline.png differ diff --git a/org.tizen.common.connection/icons/emulator_suspend.png b/org.tizen.common.connection/icons/emulator_suspend.png new file mode 100755 index 000000000..ae550af8d Binary files /dev/null and b/org.tizen.common.connection/icons/emulator_suspend.png differ diff --git a/org.tizen.common.externals/OSGI-INF/l10n/bundle.properties b/org.tizen.common.externals/OSGI-INF/l10n/bundle.properties new file mode 100755 index 000000000..0ca99154f --- /dev/null +++ b/org.tizen.common.externals/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,22 @@ +Bundle-Vendor = The Linux Foundation +Bundle-Name = Tizen Common Externals + +# properties file for ZipEditor +Bundle-Vendor.0 = Uwe Voigt +Bundle-Name.0 = ZipEditor Plug-in +content-type.name.0 = Archive +content-type.name.1 = Zip archive +content-type.name.2 = Tar GZ archive +content-type.name.3 = Tar archive +content-type.name.4 = GZip archive +content-type.name.5 = BZIP2 archive +content-type.name.6 = Tar BZIP2 archive +editor.name.0 = ZipEditor +navigatorContent.name.0 = Zip Archives +page.name.0 = Zip element +page.name.1 = Tar element +command.name = Select Pattern +command.name.0 = Reverse Selection + +navigatorContent.name.package = Tizen Package +decorator.name.package = Tizen Package Decorator \ No newline at end of file diff --git a/org.tizen.common.gom/META-INF/MANIFEST.MF b/org.tizen.common.gom/META-INF/MANIFEST.MF index a58e5ad14..a616f743d 100644 --- a/org.tizen.common.gom/META-INF/MANIFEST.MF +++ b/org.tizen.common.gom/META-INF/MANIFEST.MF @@ -8,9 +8,7 @@ Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui, org.tizen.common -Bundle-ClassPath: patch.jar, - . -Eclipse-ExtensibleAPI: true +Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.core.resources, diff --git a/org.tizen.common.gom/OSGI-INF/l10n/bundle.properties b/org.tizen.common.gom/OSGI-INF/l10n/bundle.properties new file mode 100755 index 000000000..00b205a47 --- /dev/null +++ b/org.tizen.common.gom/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,5 @@ +Bundle-Vendor = The Linux Foundation +Bundle-Name = Tizen Common Gom Tools - Smart Launch + +Gom.SmartLaunch.Label=Smart Launch +Gom.SmartLaunch.Tooltip=Smart Launch \ No newline at end of file diff --git a/org.tizen.common.gom/icons/default_project_icon.png b/org.tizen.common.gom/icons/default_project_icon.png new file mode 100755 index 000000000..d1d5cf385 Binary files /dev/null and b/org.tizen.common.gom/icons/default_project_icon.png differ diff --git a/org.tizen.common.project/OSGI-INF/l10n/bundle.properties b/org.tizen.common.project/OSGI-INF/l10n/bundle.properties new file mode 100755 index 000000000..e99666eb9 --- /dev/null +++ b/org.tizen.common.project/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,2 @@ +Bundle-Vendor = The Linux Foundation +Bundle-Name = Tizen Common Project Tools diff --git a/org.tizen.common.sdblib/OSGI-INF/l10n/bundle.properties b/org.tizen.common.sdblib/OSGI-INF/l10n/bundle.properties new file mode 100755 index 000000000..b91235127 --- /dev/null +++ b/org.tizen.common.sdblib/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,2 @@ +Bundle-Vendor = The Linux Foundation +Bundle-Name = Tizen Common sdblib diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/DeviceConstants.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/DeviceConstants.java index 0a5a2f4fd..82d533fb4 100644 --- a/org.tizen.common.sdblib/src/org/tizen/sdblib/DeviceConstants.java +++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/DeviceConstants.java @@ -47,8 +47,8 @@ DeviceConstants /** * command to get device type */ - static final String CMD_DEVICE_TYPE = "ls -al /dev/samsung_sdb 2>/dev/null | wc -l "; - static final String RESULT_DEVICE_TYPE_EMULATOR = "0"; + static final String CMD_DEVICE_TYPE = "cat /proc/cmdline | grep 'vm_name' | wc -l"; + static final String RESULT_DEVICE_TYPE_EMULATOR = "1"; /** * command to get user name diff --git a/org.tizen.common.sign/META-INF/MANIFEST.MF b/org.tizen.common.sign/META-INF/MANIFEST.MF index 682172f84..1cc09499a 100644 --- a/org.tizen.common.sign/META-INF/MANIFEST.MF +++ b/org.tizen.common.sign/META-INF/MANIFEST.MF @@ -30,6 +30,4 @@ Bundle-ClassPath: lib/bcpkix-jdk15on-147.jar, lib/org.apache.commons.httpclient.jar, lib/xmlsec-1.5.3.jar, lib/KeyCertGeneratorApi.jar, - patch.jar, . -Eclipse-ExtensibleAPI: true diff --git a/org.tizen.common.sign/OSGI-INF/l10n/bundle.properties b/org.tizen.common.sign/OSGI-INF/l10n/bundle.properties new file mode 100755 index 000000000..450fbbba9 --- /dev/null +++ b/org.tizen.common.sign/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,4 @@ +Bundle-Vendor = The Linux Foundation +Bundle-Name = Tizen Common Sign + +page.name = Security Profiles diff --git a/org.tizen.common.ui/META-INF/MANIFEST.MF b/org.tizen.common.ui/META-INF/MANIFEST.MF index b657b4070..fd5fcea9e 100644 --- a/org.tizen.common.ui/META-INF/MANIFEST.MF +++ b/org.tizen.common.ui/META-INF/MANIFEST.MF @@ -37,6 +37,4 @@ Bundle-ClassPath: lib/commons-cli-1.2.jar, lib/httpcore-4.2.4.jar, lib/commons-math3-3.2.jar, lib/jgit-cli.jar, - patch.jar, . -Eclipse-ExtensibleAPI: true diff --git a/org.tizen.common.ui/OSGI-INF/l10n/bundle.properties b/org.tizen.common.ui/OSGI-INF/l10n/bundle.properties new file mode 100755 index 000000000..bd3311997 --- /dev/null +++ b/org.tizen.common.ui/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,13 @@ +Bundle-Vendor = The Linux Foundation +Bundle-Name = Tizen Common UI + +org.tizen.common.ui.category = Tizen SDK +org.tizen.common.ui.command = Tizen SDK +org.tizen.common.ui.command.website = Tizen Web Site + +org.tizen.common.ui.preferences.appearance.name = Appearance + +extension-point.commandbar = Command Bar Extension +extension-point.tipoftheday = Tip of the day Extension +decorator.imagefile.label = Tizen Image File Decorator +decorator.referencedproject.label = Tizen Referenced Project Decorator diff --git a/org.tizen.common.ui/icons/16_IDE_icon.png b/org.tizen.common.ui/icons/16_IDE_icon.png new file mode 100755 index 000000000..1b75de141 Binary files /dev/null and b/org.tizen.common.ui/icons/16_IDE_icon.png differ diff --git a/org.tizen.common.ui/images/default_icon.png b/org.tizen.common.ui/images/default_icon.png new file mode 100755 index 000000000..6225c9252 Binary files /dev/null and b/org.tizen.common.ui/images/default_icon.png differ diff --git a/org.tizen.common.ui/images/list_viewer_bg_01.png b/org.tizen.common.ui/images/list_viewer_bg_01.png new file mode 100755 index 000000000..67a0fee77 Binary files /dev/null and b/org.tizen.common.ui/images/list_viewer_bg_01.png differ diff --git a/org.tizen.common.ui/images/new_wiz.png b/org.tizen.common.ui/images/new_wiz.png new file mode 100755 index 000000000..ff303c7c9 Binary files /dev/null and b/org.tizen.common.ui/images/new_wiz.png differ diff --git a/org.tizen.common.ui/images/tree_viewer_bg_01.png b/org.tizen.common.ui/images/tree_viewer_bg_01.png new file mode 100755 index 000000000..9244f9d86 Binary files /dev/null and b/org.tizen.common.ui/images/tree_viewer_bg_01.png differ diff --git a/org.tizen.common.ui/images/wizard_background_image.png b/org.tizen.common.ui/images/wizard_background_image.png new file mode 100755 index 000000000..9f1e34f9c Binary files /dev/null and b/org.tizen.common.ui/images/wizard_background_image.png differ diff --git a/org.tizen.common.ui/resources/tips/commandbar.html b/org.tizen.common.ui/resources/tips/commandbar.html new file mode 100755 index 000000000..1e3ac706d --- /dev/null +++ b/org.tizen.common.ui/resources/tips/commandbar.html @@ -0,0 +1,64 @@ + + + + + +Tip Of The Day + + + + + + + + + + +
Command Bar + Tizen IDE provides the Command Bar for the developer's convenient life.
+ You can input command into it and get the result immediately. Examples: +
    +
  • @newprj create (To create a project)
    • +
  • sdb devices (To run a sdb command)
    • +
  • query format date bash (To query a coding answer)
    • +
  • show --sign (To show the signing preferences dialog)
    • +
+ To see the available commands, just type 'help' and hit Enter key.

+ + + +

  • Recommendations: Command Bar provides the most frequently used commands of the user. + +

    Recommendations

    + +
  • Quick Assist: Command Bar provides the quick assist for a user action.
    + For example, it bubbles the assist introducing the sdb documentation page if a user mistypes the sdb command. And it also tries to find and suggest the correct command you intend! + +

    Quick Assist

    + + +

    + You can get it by selecting Help > Tizen SDK > Command Bar or hitting Ctrl+Shift+C key.
    + Please refer to the help documentation for more information or try it!. +

    +
    • + + diff --git a/org.tizen.common.verrari.realm/OSGI-INF/l10n/bundle.properties b/org.tizen.common.verrari.realm/OSGI-INF/l10n/bundle.properties new file mode 100755 index 000000000..c72357d96 --- /dev/null +++ b/org.tizen.common.verrari.realm/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,2 @@ +Bundle-Vendor = The Linux Foundation +Bundle-Name = Tizen Verrari Client diff --git a/org.tizen.common.verrari.realm/build.properties b/org.tizen.common.verrari.realm/build.properties index bd39d4d8f..53214e14e 100755 --- a/org.tizen.common.verrari.realm/build.properties +++ b/org.tizen.common.verrari.realm/build.properties @@ -5,6 +5,4 @@ bin.includes = META-INF/,\ about.html,\ about_files/,\ OSGI-INF/,\ - lib/,\ - lib/jackson-core-asl-1.9.13.jar,\ - lib/jackson-mapper-asl-1.9.13.jar + lib/ diff --git a/org.tizen.common.verrari/OSGI-INF/l10n/bundle.properties b/org.tizen.common.verrari/OSGI-INF/l10n/bundle.properties new file mode 100755 index 000000000..0bb63d97c --- /dev/null +++ b/org.tizen.common.verrari/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,2 @@ +Bundle-Vendor = The Linux Foundation +Bundle-Name = Tizen Verrari - Template Engine diff --git a/org.tizen.common.verrari/build.properties b/org.tizen.common.verrari/build.properties index 5fa4ce5e5..0c9157820 100644 --- a/org.tizen.common.verrari/build.properties +++ b/org.tizen.common.verrari/build.properties @@ -5,6 +5,6 @@ bin.includes = META-INF/,\ about.html,\ about_files/,\ OSGI-INF/,\ - lib/jsoup-1.6.3.jar,\ templates/jar/,\ - templates/engine/ + templates/engine/,\ + lib/ diff --git a/org.tizen.common/META-INF/MANIFEST.MF b/org.tizen.common/META-INF/MANIFEST.MF index d057049f0..1dc76b8ca 100755 --- a/org.tizen.common/META-INF/MANIFEST.MF +++ b/org.tizen.common/META-INF/MANIFEST.MF @@ -230,8 +230,7 @@ Import-Package: org.tizen.sdblib.util Bundle-Activator: org.tizen.common.CommonPlugin Bundle-ActivationPolicy: lazy -Bundle-ClassPath: patch.jar, - ., +Bundle-ClassPath: ., lib/log4j-1.2.17.jar, lib/slf4j-api-1.6.4.jar, lib/slf4j-log4j12-1.6.4.jar, @@ -243,4 +242,3 @@ Bundle-ClassPath: patch.jar, lib/commons-logging-1.1.1.jar, lib/image4j.jar, lib/svgSalamander-tiny.jar -Eclipse-ExtensibleAPI: true diff --git a/org.tizen.common/OSGI-INF/l10n/bundle.properties b/org.tizen.common/OSGI-INF/l10n/bundle.properties new file mode 100755 index 000000000..605dca93a --- /dev/null +++ b/org.tizen.common/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,32 @@ +Bundle-Vendor = The Linux Foundation +Bundle-Name = Tizen SDK Common Tools + +activity.name = newXsdDisabler +activity.name.0 = newDtdDisabler +activity.name.1 = ValidateMenuItemDisabler + +name = Tizen +page.name = Tizen SDK +activity.description = Popup UI +activity.name.2 = Popup UI +category.description = Disable CDT launch UI when Native App Perspective is activated. +category.name.0 = CDT launch UI +activity.description.0 = Launch UI elements from CDT +activity.name.3 = CDT Launch UI Elements +category.description.0 = Disable CDT Toolchain Editor Page when Tizen Perspective is activated. +category.name.1 = CDT ToolChain Editor Page +activity.description.1 = ToolChain Editor Property Page +activity.name.4 = CDT ToolChain Editor Page Elements +activity.description.2 = Wizard UI +activity.name.5 = Wizard UI +activity.description.3 = PopupMenus +activity.name.6 = PopupMenus + +org.tizen.common.preferences.rds.name = Rapid Development Support +org.tizen.common.preferences.logging.name = Logging +org.tizen.common.preferences.tools.name = Tools +org.tizen.common.preferences.tools.sdb.name = Smart Development Bridge + +extension-point.crashreporter = Crash Reporter +extension-point.prompter = Prompter +extension-point.project = ITizenProject Adapter diff --git a/org.tizen.common/build.properties b/org.tizen.common/build.properties index ced8745fc..69cc63d8e 100755 --- a/org.tizen.common/build.properties +++ b/org.tizen.common/build.properties @@ -22,6 +22,7 @@ bin.includes = META-INF/,\ schema/,\ log4j.xml,\ lib/image4j.jar,\ - lib/svgSalamander-tiny.jar + lib/svgSalamander-tiny.jar,\ + 32_IDE_icon.png javacSource=1.6 javacTarget=1.6 diff --git a/org.tizen.common/src/org/tizen/common/TizenPlatformConstants.java b/org.tizen.common/src/org/tizen/common/TizenPlatformConstants.java index 813a8b2d5..eaff0f4bd 100644 --- a/org.tizen.common/src/org/tizen/common/TizenPlatformConstants.java +++ b/org.tizen.common/src/org/tizen/common/TizenPlatformConstants.java @@ -34,6 +34,10 @@ import org.tizen.sdblib.IDevice; * @author Kangho Kim {@literal } (S-Core) */ public class TizenPlatformConstants { + // Platform name + public static final String PROFILE_WEARABLE = "tizenw"; + public static final String PROFILE_MOBILE = "mobile"; + // Definitions for common public static final String LOCALHOST = "127.0.0.1"; public static final String ENVIRONMENT_SETTING_CMD = "export "; diff --git a/package/changelog b/package/changelog index 5253dee71..58b83e90b 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,6 @@ +* 2.1.191 +- Cleanup for fragment +== changhyun1.lee 2014-04-29 * 2.1.190 - Improved the performance of refreshing logs in the Log View - Fixed unittest fail diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 5684ef01c..cccc7923f 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version:2.1.190 +Version:2.1.191 Source:common-eplugin Maintainer:kangho kim , yoonki park , hyunsik non , taeyoung son , gune Kim , ho namkoong , hyeongseok heo , gyeongseok seo , jihoon song , changhyun lee , bonyong lee , shingil kang -- cgit v1.2.3