Skip to content

Commit

Permalink
strip trailing whitespace from root files
Browse files Browse the repository at this point in the history
  • Loading branch information
L8D committed Oct 26, 2014
1 parent e9cea27 commit 43e6e28
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .coveralls.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
service_name: travis-pro
repo_token: 8YyWggHYCJrQmm4qdV2f5LVvo3vBD7Xsa
repo_token: 8YyWggHYCJrQmm4qdV2f5LVvo3vBD7Xsa
2 changes: 1 addition & 1 deletion .jamignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ examples
src
tests
.nuget
nuget
nuget
2 changes: 1 addition & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
"eqnull": true,
"node": true,
"es5": true
}
}
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ node_js:
env:
global:
- secure: "JwyiLIEV6S7wzr9eUgQ/rP8BeeSY6ZabknHpUKSk4miA7d+/acFeuMAYu0d79BG8ndFIdG9EYbA7ZY1TH/metqDTrExzYLooa0XrAYg2x+cDSboII9albVn5bvdmmWIcgcmcZwKvi5JYLHWcA3Px84Aaf3YXN9V4lS1uLhl0eBI="
- secure: "BVYlZy3vIt21bhrzKPgQzRlbwGCBrdBtRPRvX/qCGi1jYAoAtrT0bYllZpNqduPLouW3LaJDwOJx9zLDmZDwKDvPgTinpVwmkhZYRFl1kNweku3ZfeHR5ejOVYvdQEqVU4rOtTBLk6emItEPTuFtC9SPSYQZQtjnZAjHTg0jqLU="
- secure: "BVYlZy3vIt21bhrzKPgQzRlbwGCBrdBtRPRvX/qCGi1jYAoAtrT0bYllZpNqduPLouW3LaJDwOJx9zLDmZDwKDvPgTinpVwmkhZYRFl1kNweku3ZfeHR5ejOVYvdQEqVU4rOtTBLk6emItEPTuFtC9SPSYQZQtjnZAjHTg0jqLU="
16 changes: 8 additions & 8 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ var browsers = [{
'src/core/linq/observable/all.js', // where, any
'src/core/linq/observable/contains.js', // where, any
'src/core/linq/observable/count.js', // where, aggregate
'src/core/linq/observable/indexof.js',
'src/core/linq/observable/indexof.js',
'src/core/linq/observable/sum.js', // select, aggregate
'src/core/linq/observable/minby.js', // _extremaby
'src/core/linq/observable/min.js', // minby, _firstonly
Expand Down Expand Up @@ -445,7 +445,7 @@ var browsers = [{
'src/core/linq/observable/all.js', // where, any
'src/core/linq/observable/contains.js', // where, any
'src/core/linq/observable/count.js', // where, aggregate
'src/core/linq/observable/indexof.js',
'src/core/linq/observable/indexof.js',
'src/core/linq/observable/sum.js', // select, aggregate
'src/core/linq/observable/minby.js', // _extremaby
'src/core/linq/observable/min.js', // minby, _firstonly
Expand Down Expand Up @@ -705,7 +705,7 @@ var browsers = [{
'src/core/linq/observable/where.js',

// Transducers
'src/core/linq/observable/transduce.js',
'src/core/linq/observable/transduce.js',

'src/core/anonymousobservable.js',
'src/core/autodetachobserver.js',
Expand Down Expand Up @@ -835,7 +835,7 @@ var browsers = [{
'src/core/linq/observable/where.js',

// Transducers
'src/core/linq/observable/transduce.js',
'src/core/linq/observable/transduce.js',

'src/core/anonymousobservable.js',
'src/core/autodetachobserver.js',
Expand Down Expand Up @@ -1221,7 +1221,7 @@ var browsers = [{
'src/core/linq/observable/all.js', // where, any
'src/core/linq/observable/contains.js', // where, any
'src/core/linq/observable/count.js', // where, aggregate
'src/core/linq/observable/indexof.js',
'src/core/linq/observable/indexof.js',
'src/core/linq/observable/sum.js', // select, aggregate
'src/core/linq/observable/minby.js', // _extremaby
'src/core/linq/observable/min.js', // minby, _firstonly
Expand Down Expand Up @@ -1345,7 +1345,7 @@ var browsers = [{
// Experimental Flattening
'src/core/linq/observable/exclusive.js',
'src/core/linq/observable/exclusivemap.js',

'src/core/suboutro.js'
],
dest: 'dist/rx.experimental.js'
Expand Down Expand Up @@ -1443,7 +1443,7 @@ var browsers = [{
'src/core/suboutro.js'
],
dest: 'dist/rx.sorting.js'
}
}
},
uglify: {
options: {
Expand Down Expand Up @@ -1582,7 +1582,7 @@ var browsers = [{
sourceMapName: 'dist/rx.sorting.map'
},
files: {'dist/rx.sorting.min.js': ['dist/rx.sorting.js'] }
}
}
},
qunit: {
all: ['tests/*.html']
Expand Down
2 changes: 1 addition & 1 deletion authors.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Matthew Podwysocki <[email protected]>
Bart de Smet <[email protected]>
Erik Meijer <[email protected]>
Erik Meijer <[email protected]>
30 changes: 15 additions & 15 deletions license.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
Microsoft Open Technologies would like to thank its contributors, a list
of whom are at http://rx.codeplex.com/wikipage?title=Contributors.
Licensed under the Apache License, Version 2.0 (the "License"); you
may not use this file except in compliance with the License. You may
obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. See the License for the specific language governing permissions
and limitations under the License.
Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
Microsoft Open Technologies would like to thank its contributors, a list
of whom are at http://rx.codeplex.com/wikipage?title=Contributors.

Licensed under the Apache License, Version 2.0 (the "License"); you
may not use this file except in compliance with the License. You may
obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. See the License for the specific language governing permissions
and limitations under the License.
8 changes: 4 additions & 4 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@ Finally, we call the subscribe method on our observable sequence to start pullin

```js
suggestions.subscribe( function (data) {
$('#results')
.empty ()
.append ($.map function(data[1], (value) {
return $('<li>').text (value));
$('#results')
.empty ()
.append ($.map function(data[1], (value) {
return $('<li>').text (value));
});
}, function (error) {
$results.empty().append($'<li>').text('Error:' + error);
Expand Down
8 changes: 4 additions & 4 deletions travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,22 @@ if [ "$1" = "merge" ] ; then
# If the build was successful, travis after-success will send merge
echo "Merging incoming-pr to master"
git checkout master
git merge incoming-pr --log
git merge incoming-pr --log
git push $repo master -q 2> /dev/null
else
# If build failed, travis after-failure will send ./travis.sh revert
echo "Reverting dev branch to what master was"
# Save the current changes to a new branch
echo "Creating a new branch for failed build - incoming-pr-fail-$TRAVIS_BUILD_ID"
git checkout -b incoming-pr-fail-$TRAVIS_BUILD_ID
git push $repo incoming-pr-fail-$TRAVIS_BUILD_ID -q 2> /dev/null
git push $repo incoming-pr-fail-$TRAVIS_BUILD_ID -q 2> /dev/null
git checkout master
fi

echo "Making incoming-pr same as master"
# Merge or revert is done, so make incoming-pr branch at par with master
# This is done to make it ready for accepting the next pull request
git push $repo --delete incoming-pr -q 2> /dev/null
git push $repo --delete incoming-pr -q 2> /dev/null
git branch -D incoming-pr
git branch incoming-pr
git push $repo incoming-pr -q 2> /dev/null
git push $repo incoming-pr -q 2> /dev/null

0 comments on commit 43e6e28

Please sign in to comment.