diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
| commit | 54d44a9bd04cfbed8426614fc69c027a46f41a14 (patch) | |
| tree | 34bdf65a6e8d5d6d4016154345d1d803ba0da379 /tests/testheightforwidth.c | |
| parent | b3b22c31b997fb85b3319b392a1a69407703184c (diff) | |
| parent | 67194ed77b153eb5a7eb6c596f3c20e274b7787a (diff) | |
| download | gtk+-native-layout.tar.gz | |
Merge branch 'master' into native-layoutnative-layout
Conflicts:
gtk/gtkplug.c
gtk/gtkscrolledwindow.c
Diffstat (limited to 'tests/testheightforwidth.c')
| -rw-r--r-- | tests/testheightforwidth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c index bc164521ff..26e9ea84ce 100644 --- a/tests/testheightforwidth.c +++ b/tests/testheightforwidth.c @@ -1031,7 +1031,7 @@ TestInterface interfaces[] = { " </row>" " <row>" " <col id=\"0\" translatable=\"yes\">to demonstrate natural</col>" - " <col id=\"1\" translatable=\"yes\">gtk-info</col>" + " <col id=\"1\" translatable=\"yes\">gtk-execute</col>" " <col id=\"2\" translatable=\"yes\">is not</col>" " <col id=\"3\" translatable=\"yes\">can</col>" " </row>" @@ -1086,7 +1086,7 @@ TestInterface interfaces[] = { " </row>" " <row>" " <col id=\"0\" translatable=\"yes\">to demonstrate height-for-width</col>" - " <col id=\"1\" translatable=\"yes\">gtk-info</col>" + " <col id=\"1\" translatable=\"yes\">gtk-execute</col>" " <col id=\"2\" translatable=\"yes\">is not</col>" " <col id=\"3\" translatable=\"yes\">can</col>" " </row>" |