Tk Source Code

Check-in [9df6b36e]
Login
☰Core Home Timeline Branches Tags Tickets Download Wiki

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Resolve ChangeLog conflict mistakenly committed.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 9df6b36eecba80f3bda7a2cb01316e53028f7ee5
User & Date: dgp 2011-04-11 12:30:49
Context
2011-04-12
14:29
minor nits, taken over from TEA (tclconfig) check-in: 996d3b4c user: jan.nijtmans tags: trunk
2011-04-11
12:30
Resolve ChangeLog conflict mistakenly committed. check-in: 9df6b36e user: dgp tags: trunk
07:53
sync with Tcl version of tcl.m4 check-in: da0375ad user: jan.nijtmans tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ChangeLog. 

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17

<<<<<<< BEGIN MERGE CONFLICT: original content first <<<<<<<
2011-03-29  Jan Nijtmans  <[email protected]>

	* generic/tk.decls:     [Tcl Bug 3029891]: Functions that don't belong in
	* generic/tkDecls.h:    the stub table. Tk part follow-up: Separate non-stub
	* generic/tkStubInit.c: entries in tkDecls.h, and hide away the obsolete
	stub entries using macros.

2011-03-28  Donal K. Fellows  <[email protected]>
======= original content above; conflict below =============
2011-04-06  Jan Nijtmans  <[email protected]>

	* unix/tkAppInit.c:  Make symbols "main" and "Tcl_AppInit"
	MODULE_SCOPE: there is absolutely no reason for exporting them.
	* unix/tcl.m4:        Don't use -fvisibility=hidden with static
	* unix/configure      libraries (--disable-shared)


<
<
<
<
<
<
<
<
<
<


















1
2
3
4
5
6
7











2011-04-06  Jan Nijtmans  <[email protected]>

	* unix/tkAppInit.c:  Make symbols "main" and "Tcl_AppInit"
	MODULE_SCOPE: there is absolutely no reason for exporting them.
	* unix/tcl.m4:        Don't use -fvisibility=hidden with static
	* unix/configure      libraries (--disable-shared)
︙︙
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48

	* doc/frame.n:
	* generic/tkFrame.c: [Bug 2997657]: Removed -container from labelframe
	documentation since it does not work as expected and does not make
	sense as a container. Added note to frame about restrictions when used
	as a container.

2011-03-28  Donal K. Fellows  <[email protected]>
>>>>>>> END MERGE CONFLICT: conflict last >>>>>>>>>>>>>>>>>>

	* library/tk.tcl (::tk::FindAltKeyTarget): Make this handle the
	traversal of the logical window manager hierarchy correctly. Based on
	comments by Emiliano Gavilan.

2011-03-28  Jan Nijtmans  <[email protected]>









<








24
25
26
27
28
29
30

31
32
33
34
35
36
37

	* doc/frame.n:
	* generic/tkFrame.c: [Bug 2997657]: Removed -container from labelframe
	documentation since it does not work as expected and does not make
	sense as a container. Added note to frame about restrictions when used
	as a container.

2011-03-28  Donal K. Fellows  <[email protected]>


	* library/tk.tcl (::tk::FindAltKeyTarget): Make this handle the
	traversal of the logical window manager hierarchy correctly. Based on
	comments by Emiliano Gavilan.

2011-03-28  Jan Nijtmans  <[email protected]>
︙︙

This page was generated in about 0.068s by Fossil 2.24 [f4ffefe708] 2024-04-17 14:02:19