projects
/
platform
/
core
/
csapi
/
tizenfx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1938072
951205b
)
Merge "Add C# binding for Extends type. Add C# binding for Margin and PaddingEX prope...
author
dongsug song
<dongsug.song@samsung.com>
Wed, 18 Oct 2017 02:13:31 +0000
(
02:13
+0000)
committer
Gerrit Code Review
<gerrit@review.ap-northeast-2.compute.internal>
Wed, 18 Oct 2017 02:13:31 +0000
(
02:13
+0000)
1
2
src/Tizen.NUI/src/internal/NDalicPINVOKE.cs
patch
|
diff1
|
diff2
|
blob
|
history
src/Tizen.NUI/src/public/BaseComponents/View.cs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/Tizen.NUI/src/internal/NDalicPINVOKE.cs
Simple merge
diff --cc
src/Tizen.NUI/src/public/BaseComponents/View.cs
index
02ff6ba
,
e26a1e9
..
7693df8
---
1
/
src/Tizen.NUI/src/public/BaseComponents/View.cs
---
2
/
src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/
src/Tizen.NUI/src/public/BaseComponents/View.cs
@@@
-4441,4
-4487,4
+4477,4
@@@
namespace Tizen.NUI.BaseComponent
/// </summary>
RTL
}
--}
++}