* renamed to avoid conflict with gtkobject.inc of gtk2 units in packages

git-svn-id: trunk@12577 -
This commit is contained in:
michael 2007-10-24 08:03:07 +00:00
parent be01926f6b
commit e22b210485
3 changed files with 2 additions and 2 deletions

2
.gitattributes vendored
View File

@ -2794,6 +2794,7 @@ lcl/interfaces/gtk/gtk1extra.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtk1extrah.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtk1memostrings.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtk1memostringsh.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtk1object.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtk1trayicon.inc -text
lcl/interfaces/gtk/gtk1wsprivate.pp svneol=native#text/pascal
lcl/interfaces/gtk/gtkcallback.inc svneol=native#text/pascal
@ -2815,7 +2816,6 @@ lcl/interfaces/gtk/gtklclintfh.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtklistsl.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtklistslh.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtkmsgqueue.pp svneol=native#text/pascal
lcl/interfaces/gtk/gtkobject.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtkpagecallback.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtkprivatewidget.inc svneol=native#text/plain
lcl/interfaces/gtk/gtkproc.inc svneol=native#text/pascal

View File

@ -367,7 +367,7 @@ uses
{$I gtklistsl.inc}
{$I gtkfiledialogutils.inc}
{$I gtkobject.inc}
{$I gtk1object.inc}
{$I gtkwinapi.inc}
{$I gtklclintf.inc}