projects
/
platform
/
core
/
csapi
/
tizenfx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
738be7d
d86e741
)
Merge "[NUI] Change the key of Placeholder property"
author
dongsug song
<dongsug.song@samsung.com>
Wed, 18 Oct 2017 02:46:27 +0000
(
02:46
+0000)
committer
Gerrit Code Review
<gerrit@review.ap-northeast-2.compute.internal>
Wed, 18 Oct 2017 02:46:27 +0000
(
02:46
+0000)
1
2
src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
patch
|
diff1
|
diff2
|
blob
|
history
src/Tizen.NUI/src/public/BaseComponents/TextField.cs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
index
5762cb8
,
bf6de33
..
0f69905
---
1
/
src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
---
2
/
src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
+++ b/
src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
@@@
-1444,4
-1444,4
+1444,4
@@@
namespace Tizen.NUI.BaseComponent
}
--}
++}
diff --cc
src/Tizen.NUI/src/public/BaseComponents/TextField.cs
index
2a9096a
,
614253b
..
d9b7128
---
1
/
src/Tizen.NUI/src/public/BaseComponents/TextField.cs
---
2
/
src/Tizen.NUI/src/public/BaseComponents/TextField.cs
+++ b/
src/Tizen.NUI/src/public/BaseComponents/TextField.cs
@@@
-1450,4
-1450,4
+1450,4
@@@
namespace Tizen.NUI.BaseComponent
}
--}
++}