Merge branch 'upstream' into tizen 86/46386/1 accepted/tizen/mobile/20150902.004600 accepted/tizen/tv/20150902.004610 accepted/tizen/wearable/20150902.004616 submit/tizen/20150901.111553
authorHyejin Kim <hyejin0906.kim@samsung.com>
Thu, 20 Aug 2015 02:21:50 +0000 (11:21 +0900)
committerHyejin Kim <hyejin0906.kim@samsung.com>
Thu, 20 Aug 2015 02:26:06 +0000 (11:26 +0900)
commitb7d6e1f0e1a5df95e2950beaf9269932f895269a
tree95aa4c1e7f203834237bc2f72f5f8dc403c2b001
parent3caa87343ee020f95f3bce84eab8664ac5cc1640
parentc55b214458bed6f6c6dc57e3fccfc8dc8558e7ee
Merge branch 'upstream' into tizen

And version 0.6.0 applied

Change-Id: Iabc3dc2fc4bd984a114445d8b70df57eb43c3b16
packaging/config
packaging/toybox.spec