Skip to content

Commit

Permalink
Merge pull request #2 from SeasideSt/master
Browse files Browse the repository at this point in the history
Grease 1.2.7
  • Loading branch information
jbrichau committed Mar 27, 2016
2 parents 318e4e6 + f1a2bce commit d9c9daa
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 104 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ smalltalk:
- GemStone-3.1.0.6
- GemStone-3.2.12
- GemStone-3.3.0
cache:
directories:
- $SMALLTALK_CI_CACHE
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ resolveWith: aDictionary
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo30-') ifAbsent: [
"try -Pharo40-"
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo40-') ifAbsent: [
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ]
"try -Pharo50-"
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo50-') ifAbsent: [
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ]
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"name" : "lr 2/17/2010 15:18",
"name:" : "lr 10/25/2009 11:26",
"printOn:" : "merged 10/20/2008 09:24",
"resolveWith:" : "jok 8/23/2014 10:59",
"resolveWith:" : "JohanBrichau 3/26/2016 15:54",
"seasideAddonsUrl" : "pmm 9/12/2013 15:59",
"seasideLGPLUrl" : "pmm 9/12/2013 15:59",
"seasideUrl" : "pmm 9/12/2013 15:58",
Expand Down
8 changes: 4 additions & 4 deletions repository/Grease-Core.package/monticello.meta/categories.st
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SystemOrganization addCategory: #'Grease-Core'!
SystemOrganization addCategory: #'Grease-Core-Collections'!
SystemOrganization addCategory: #'Grease-Core-Exceptions'!
SystemOrganization addCategory: #'Grease-Core-Text'!
SystemOrganization addCategory: #'Grease-Core-Utilities'!
SystemOrganization addCategory: 'Grease-Core-Collections'!
SystemOrganization addCategory: 'Grease-Core-Exceptions'!
SystemOrganization addCategory: 'Grease-Core-Text'!
SystemOrganization addCategory: 'Grease-Core-Utilities'!
4 changes: 2 additions & 2 deletions repository/Grease-Core.package/monticello.meta/version

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

84 changes: 0 additions & 84 deletions tests/testTravisCI.sh

This file was deleted.

0 comments on commit d9c9daa

Please sign in to comment.