review.tizen.org Git - sdk/tools/cli.git/commit

projects / sdk / tools / cli.git / commit

author	Taeyoung Son <taeyoung2.son@samsung.com>
	Thu, 29 May 2014 03:57:35 +0000 (12:57 +0900)
committer	Taeyoung Son <taeyoung2.son@samsung.com>
	Thu, 29 May 2014 03:57:35 +0000 (12:57 +0900)
commit	8c9fbe1057d56ef596935390a280078e32b544fd
tree	94cbcb3302260f7ee03da815fed6fcc811b6ad6e	tree \| snapshot
parent	678555344c15e355d89286784e863b8d9a93c1e7	commit \| diff
parent	70865dc3c5bf8f39a50a2b8118e1bb950382babe	commit \| diff

Merge branch 'mw' into tizen

Conflicts:
org.tizen.ncli.ide/META-INF/MANIFEST.MF

Change-Id: Ic98ceebb9a726826d8327e622e1b725f3130b6e4
Signed-off-by: Taeyoung Son <taeyoung2.son@samsung.com>

70 files changed:

AUTHORS	diff1 \|	diff2 \|	blob \| history
LICENSE	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/.settings/org.eclipse.core.resources.prefs	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/doc/install/doc/schema/profiles.xsd	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/doc/install/document/README_HYBRIDAPP.txt	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/doc/install/native_bin/native-debug.bat	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/doc/install/native_bin/native-install.bat	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/doc/install/native_bin/native-make.bat	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/doc/install/native_bin/native-run.bat	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/doc/install/native_bin/native-uninstall.bat	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/doc/install/realm/config.json	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/src/org/tizen/cli/command/AbstractCommand.java	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/src/org/tizen/cli/command/CommandWithParameter.java	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/src/org/tizen/cli/command/PluginConstants.java	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/src/org/tizen/cli/exec/sign/profile.help	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/src/org/tizen/cli/util/TemplateModelProvider.java	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/test/src/org/tizen/cli/exec/ConsolePrompterTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/test/src/org/tizen/cli/exec/template/ClientMainTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/.project	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/.settings/org.eclipse.jdt.core.prefs	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/.settings/org.eclipse.pde.core.prefs	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/META-INF/MANIFEST.MF	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/build-auto.xml	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/build.properties	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/build.xml	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/common.bat	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/core/collection/TreeNodeIter.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/CLIConstant.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/Tizen.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/TizenCLIConfig.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/config/ConfigConstant.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/config/Configuration.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/core/command/CreateCommand.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/core/command/SaveConfigFileCommand.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/core/command/SetConfigCommand.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/core/command/TizenCommand.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/core/config/NCLIConfigLoader.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/core/config/TizenCLIConfigProvider.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/exec/NewCommandLineExecutor.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/BuildNativeCLI.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/BuildWebCLI.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/ConfigCLI.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateCLI.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateCertificateCLI.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateSecProfileCLI.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateSecProfileItemCLI.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/SignCLI.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/TizenAppType.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/AbstractSubCommand.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/ConfigCLICommand.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/testProject/.project	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/testProject/.settings/.jsdtscope	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/testProject/.settings/org.eclipse.wst.css.core.prefs	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/testProject/.settings/org.eclipse.wst.validation.prefs	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/testProject/tizen-web-ui-fw/latest/js/cultures/globalize.cultures.js	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/testProject/tizen-web-ui-fw/latest/js/jquery.js	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/testProject/tizen-web-ui-fw/latest/js/modules/widgets/jquery.mobile.tizen.checkbox.js	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/testProject/tizen-web-ui-fw/latest/js/tizen-web-ui-fw.js	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/tizen-cli-config-global	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/tizen-cli-config-local	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/core/config/NCLIConfigLoaderTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/shell/Args4JTestBase.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/shell/ConfigCLITest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/BuildWebCLICommandTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/CommonCLISubCommandTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/ConfigCommandListTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/ConfigCommandTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/TizenCLIConfigProviderTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/tizen.bat	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/todo.txt	diff1 \|	diff2 \|	blob \| history

Domain: SDK / Command line tools;

RSS Atom

AUTHORS	diff1 \|	diff2 \|	blob \| history
LICENSE	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/.settings/org.eclipse.core.resources.prefs	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/doc/install/doc/schema/profiles.xsd	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/doc/install/document/README_HYBRIDAPP.txt	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/doc/install/native_bin/native-debug.bat	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/doc/install/native_bin/native-install.bat	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/doc/install/native_bin/native-make.bat	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/doc/install/native_bin/native-run.bat	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/doc/install/native_bin/native-uninstall.bat	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/doc/install/realm/config.json	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/src/org/tizen/cli/command/AbstractCommand.java	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/src/org/tizen/cli/command/CommandWithParameter.java	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/src/org/tizen/cli/command/PluginConstants.java	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/src/org/tizen/cli/exec/sign/profile.help	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/src/org/tizen/cli/util/TemplateModelProvider.java	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/test/src/org/tizen/cli/exec/ConsolePrompterTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.cli/test/src/org/tizen/cli/exec/template/ClientMainTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/.project	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/.settings/org.eclipse.jdt.core.prefs	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/.settings/org.eclipse.pde.core.prefs	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/META-INF/MANIFEST.MF	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/build-auto.xml	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/build.properties	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/build.xml	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/common.bat	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/core/collection/TreeNodeIter.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/CLIConstant.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/Tizen.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/TizenCLIConfig.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/config/ConfigConstant.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/config/Configuration.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/core/command/CreateCommand.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/core/command/SaveConfigFileCommand.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/core/command/SetConfigCommand.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/core/command/TizenCommand.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/core/config/NCLIConfigLoader.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/core/config/TizenCLIConfigProvider.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/exec/NewCommandLineExecutor.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/BuildNativeCLI.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/BuildWebCLI.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/ConfigCLI.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateCLI.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateCertificateCLI.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateSecProfileCLI.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/CreateSecProfileItemCLI.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/SignCLI.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/shell/TizenAppType.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/AbstractSubCommand.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/src/org/tizen/ncli/ide/subcommands/ConfigCLICommand.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/testProject/.project	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/testProject/.settings/.jsdtscope	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/testProject/.settings/org.eclipse.wst.css.core.prefs	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/testProject/.settings/org.eclipse.wst.validation.prefs	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/testProject/tizen-web-ui-fw/latest/js/cultures/globalize.cultures.js	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/testProject/tizen-web-ui-fw/latest/js/jquery.js	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/testProject/tizen-web-ui-fw/latest/js/modules/widgets/jquery.mobile.tizen.checkbox.js	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/testProject/tizen-web-ui-fw/latest/js/tizen-web-ui-fw.js	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/tizen-cli-config-global	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/resources/tizen-cli-config-local	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/core/config/NCLIConfigLoaderTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/shell/Args4JTestBase.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/shell/ConfigCLITest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/BuildWebCLICommandTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/CommonCLISubCommandTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/ConfigCommandListTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/ConfigCommandTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/test/src/org/tizen/ncli/ide/subcommands/TizenCLIConfigProviderTest.java	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/tizen.bat	diff1 \|	diff2 \|	blob \| history
org.tizen.ncli.ide/todo.txt	diff1 \|	diff2 \|	blob \| history