Merge branch 'gbs_dev' into develop
authordonghee yang <donghee.yang@samsung.com>
Tue, 20 Nov 2012 09:48:18 +0000 (18:48 +0900)
committerdonghee yang <donghee.yang@samsung.com>
Tue, 20 Nov 2012 09:48:18 +0000 (18:48 +0900)
commit3d59ad5ae797e19fd0dbf4a152129c31ddd63846
tree08efcb9df06f0f237a9addc4546b428542b9b073
parentb7acfc8ae455ba80723f23065c37af4151cf0f32
parent7b7f036114b1ffa30f2cac28ca7a2cf9861921d5
Merge branch 'gbs_dev' into develop

Conflicts:
org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/TizenDebianLaunchDelegate.java
org.tizen.nativeplatform/src/org/tizen/nativeplatform/wizards/TizenPlatformProjectWizard.java

Change-Id: I015015e9fa9aabc90c56ba9bdbb69f26f7d2d8a7
org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/TizenDebianLaunchDelegate.java
org.tizen.nativeplatform/src/org/tizen/nativeplatform/wizards/TizenPlatformProjectWizard.java