--- a/Makefile Sun Mar 31 22:12:44 2013 +0200
+++ b/Makefile Sun Mar 31 22:32:27 2013 +0200
@@ -1,21 +1,18 @@
#
-# DO NOT EDIT
-#
-# make uses this file (Makefile) only, if there is no
-# file named "makefile" (lower-case m) in the same directory.
-# My only task is to generate the real makefile and call make again.
-# Thereafter, I am no longer used and needed.
+# DO NOT EDIT
+# automagically generated from Make.proto (by make mf)
#
-
-.PHONY: run
-
-run: makefile
- $(MAKE) -f makefile
-
-#only needed for the definition of $(TOP)
+include ../rules/stdHeader
+include ../configurations/COMMON/defines
+include ../configurations/vendorConf
+include ../configurations/myConf
+include ../rules/stdHeader2
+include Make.spec
include Make.proto
-makefile: mf
+BASE_CONF=osx_x/gcc
+BASE_CONF_VENDOR=mac
+CONF_PACKS=
+CONF_TOOLS=
-mf:
- $(TOP)/rules/stmkmf
+include ../rules/stdRules
--- a/Tools__InlineMessageDialog.st Sun Mar 31 22:12:44 2013 +0200
+++ b/Tools__InlineMessageDialog.st Sun Mar 31 22:32:27 2013 +0200
@@ -318,7 +318,7 @@
!InlineMessageDialog class methodsFor:'others'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__InlineMessageDialog.st,v 1.10 2013-03-31 17:05:03 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__InlineMessageDialog.st,v 1.11 2013-03-31 20:32:27 cg Exp $'
! !
!InlineMessageDialog methodsFor:'accessing'!
@@ -406,12 +406,6 @@
"Created: / 04-10-2012 / 19:20:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-doAbortIfWorking
- worker notNil ifTrue:[ self doAbort ].
-
- "Created: / 04-10-2012 / 19:20:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
doOK
<resource: #uiCallback>
@@ -943,7 +937,7 @@
!InlineMessageDialog class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__InlineMessageDialog.st,v 1.10 2013-03-31 17:05:03 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__InlineMessageDialog.st,v 1.11 2013-03-31 20:32:27 cg Exp $'
!
version_HG