--- a/ProjectDefinition.st	Wed Mar 13 00:42:41 2013 +0000
+++ b/ProjectDefinition.st	Wed Mar 13 00:55:04 2013 +0000
@@ -90,7 +90,6 @@
 "
 ! !
 
-
 !ProjectDefinition class methodsFor:'instance creation'!
 
 definitionClassForMonticelloPackage:aMonicelloPackagename
@@ -224,7 +223,6 @@
     "Modified: / 17-08-2006 / 17:24:23 / cg"
 ! !
 
-
 !ProjectDefinition class methodsFor:'accessing'!
 
 directory
@@ -1000,7 +998,6 @@
     "Modified: / 08-08-2011 / 14:59:45 / cg"
 ! !
 
-
 !ProjectDefinition class methodsFor:'class initialization'!
 
 initialize
@@ -1122,7 +1119,6 @@
     "Modified: / 20-08-2011 / 23:32:32 / cg"
 ! !
 
-
 !ProjectDefinition class methodsFor:'code generation'!
 
 applicationIconFileName_code
@@ -1816,7 +1812,6 @@
     "Created: / 23-08-2006 / 14:27:32 / cg"
 ! !
 
-
 !ProjectDefinition class methodsFor:'description'!
 
 excludedFromPreRequisites
@@ -1931,7 +1926,6 @@
     "Modified: / 17-08-2006 / 19:57:46 / cg"
 ! !
 
-
 !ProjectDefinition class methodsFor:'description - actions'!
 
 postLoadAction
@@ -1995,7 +1989,6 @@
     "Created: / 23-01-2007 / 19:08:27 / cg"
 ! !
 
-
 !ProjectDefinition class methodsFor:'description - compilation'!
 
 additionalBaseAddressDefinition_bc_dot_mak
@@ -2380,6 +2373,7 @@
     "Created: / 18-08-2006 / 12:51:38 / cg"
 ! !
 
+
 !ProjectDefinition class methodsFor:'description - project information'!
 
 applicationAdditionalIconFileNames
@@ -2808,7 +2802,6 @@
     "Modified: / 17-08-2006 / 19:46:29 / cg"
 ! !
 
-
 !ProjectDefinition class methodsFor:'file generation'!
 
 apspecFilename
@@ -3311,7 +3304,6 @@
     "Created: / 07-09-2006 / 17:07:00 / cg"
 ! !
 
-
 !ProjectDefinition class methodsFor:'file mappings'!
 
 autopackage_default_dot_apspec_mappings
@@ -3599,7 +3591,6 @@
                 replaceAny:':' with:$_
 ! !
 
-
 !ProjectDefinition class methodsFor:'file mappings support'!
 
 classNamesByCategory
@@ -4251,7 +4242,6 @@
     ^ self subProjectMakeCallsUsing:'call vcmake %1 %2'.
 ! !
 
-
 !ProjectDefinition class methodsFor:'file templates'!
 
 autopackage_default_dot_apspec
@@ -4690,7 +4680,6 @@
     "Modified: / 04-09-2012 / 11:45:49 / cg"
 ! !
 
-
 !ProjectDefinition class methodsFor:'loading'!
 
 ensureFullyLoaded
@@ -4857,7 +4846,6 @@
     "Modified: / 20-11-2012 / 23:06:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProjectDefinition class methodsFor:'misc ui support'!
 
 iconInBrowserSymbol
@@ -4872,7 +4860,6 @@
     ^ super iconInBrowserSymbol
 ! !
 
-
 !ProjectDefinition class methodsFor:'private'!
 
 abbrevs
@@ -5476,7 +5463,6 @@
     "Created: / 03-06-2011 / 17:01:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProjectDefinition class methodsFor:'private-extension handling'!
 
 hasSavedOverwrittenMethods
@@ -5591,7 +5577,6 @@
     ^ safeForOverwrittenMethods at:(aClass name,'>>',aSelector) ifAbsent:nil
 ! !
 
-
 !ProjectDefinition class methodsFor:'private-loading'!
 
 checkPrerequisitesForLoading
@@ -6126,7 +6111,6 @@
     ]
 ! !
 
-
 !ProjectDefinition class methodsFor:'private-prerequisites'!
 
 addReferencesToClassesFromGlobalsIn:aSetOfClasses to:usedClassReasons
@@ -6214,7 +6198,9 @@
     orderedTuples := OrderedCollection new.
     allPreRequisites := self allPreRequisites.
 
-    allPreRequisites do:[:eachPackageID |
+    "/JV@2013-03-13: Added asSortedCollection to make the order of packages
+    "/as stable as possible. Makes merging of makefiles a lot easier.
+    allPreRequisites asSortedCollection do:[:eachPackageID |
         |def|
 
         self assert:(eachPackageID ~= self package).
@@ -6245,13 +6231,13 @@
      stx_libbasic allPreRequisitesSorted
      stx_libbasic2 allPreRequisitesSorted
      stx_libwidg2 allPreRequisitesSorted
-     exept_expecco_application allPreRequisitesSorted
+     exept_expecco allPreRequisitesSorted
      alspa_batch_application allPreRequisitesSorted
      ubs_application allPreRequisitesSorted
     "
 
     "Modified: / 13-04-2011 / 15:19:13 / sr"
-    "Modified: / 28-06-2011 / 14:04:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (comment): / 13-03-2013 / 00:40:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 allPreRequisitesWithParentDo:aBlock
@@ -6465,7 +6451,6 @@
     "Created: / 06-09-2011 / 08:29:37 / cg"
 ! !
 
-
 !ProjectDefinition class methodsFor:'queries'!
 
 allClassNames
@@ -6836,7 +6821,6 @@
     ^ self subclassResponsibility
 ! !
 
-
 !ProjectDefinition class methodsFor:'queries-privacy'!
 
 showClassDocumentationOf:aClass
@@ -6850,7 +6834,6 @@
     "Created: / 05-11-2007 / 16:44:16 / cg"
 ! !
 
-
 !ProjectDefinition class methodsFor:'sanity checks'!
 
 validateDescription
@@ -7008,7 +6991,6 @@
     "Created: / 05-03-2012 / 12:18:45 / cg"
 ! !
 
-
 !ProjectDefinition class methodsFor:'testing'!
 
 isApplicationDefinition
@@ -7046,7 +7028,6 @@
     "Modified: / 08-02-2011 / 10:03:49 / cg"
 ! !
 
-
 !ProjectDefinition::AbbrevEntry methodsFor:'accessing'!
 
 category
@@ -7076,7 +7057,6 @@
     "Created: / 18-08-2011 / 14:18:37 / cg"
 ! !
 
-
 !ProjectDefinition class methodsFor:'documentation'!
 
 version
@@ -7087,6 +7067,11 @@
     ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.424 2013-03-11 12:47:59 cg Exp $'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
     ^ '§ Id: ProjectDefinition.st 10645 2011-06-09 15:28:45Z vranyj1  §'
 ! !