projects / sdk / ide / common-eplugin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd0f828 e140cf6)
Merge branch 'sdb' of sunaegit:/slp/sdk/public/common/ide/common-ide-eplugin into sdb
authorjoogwan.kim <joogwan.kim@samsung.com>
Tue, 8 Nov 2011 08:44:28 +0000 (17:44 +0900)
committerjoogwan.kim <joogwan.kim@samsung.com>
Tue, 8 Nov 2011 08:44:28 +0000 (17:44 +0900)
Conflicts:
com.samsung.slp.common/META-INF/MANIFEST.MF
com.samsung.slp.common/build.properties

1  2 
com.samsung.slp.common/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
com.samsung.slp.common/build.properties patch | diff1 | diff2 | blob | history
com.samsung.slp.connection/plugin.xml patch | diff1 | diff2 | blob | history

diff --cc com.samsung.slp.common/build.properties
index 9aca496,c8c2a34..1756960
--- 1/com.samsung.slp.common/build.properties
--- 2/com.samsung.slp.common/build.properties
+++ b/com.samsung.slp.common/build.properties
@@@ -2,6 -2,7 +2,7 @@@ source.. = src
  output.. = bin/\r
  bin.includes = META-INF/,\\r
                 .,\\r
-                icons/\r
 -               plugin.xml,\\r
++               icons/,\\r
+                sdblib.jar\r
  javacSource = 1.6
  javacTarget = 1.6
diff --cc com.samsung.slp.connection/plugin.xml
Simple merge
Domain: SDK / Common IDE;