Nick Martin
|
459dac9cac
|
Merge branch 'master' into meteor
conflicts hand resolved. deftemplate and liveui reverted to master, will re-do later.
Conflicts:
admin/generate-dev-bundle.sh
admin/install-s3.sh
admin/manifest.json
app/meteor/deploy.js
app/meteor/meteor.js
examples/leaderboard/leaderboard.js
examples/unfinished/azrael/client/azrael.js
examples/unfinished/azrael/model.js
packages/liveui/liveui.js
packages/templating/deftemplate.js
packages/templating/html_scanner.js
tests/minimongo/test.html
|
2012-01-18 16:14:54 -08:00 |
|
Nick Martin
|
1b9e00842b
|
Bump dev bundle version.
|
2012-01-13 16:40:29 -08:00 |
|
Nick Martin
|
5d6fb2af58
|
Patch for socket.io bug already fixed in master.
|
2012-01-13 16:38:28 -08:00 |
|
Nick Martin
|
e7c23b0634
|
Update dependency versions.
|
2012-01-13 16:13:46 -08:00 |
|
Nick Martin
|
05794f5643
|
perl -pi -e 's/skybreak/meteor/g' **/*
|
2012-01-04 18:32:23 -08:00 |
|
Nick Martin
|
23cd5b6912
|
perl -pi -e 's/Skybreak/Meteor/g' **/*
|
2012-01-04 18:30:25 -08:00 |
|
Nick Martin
|
b81ae24ec5
|
Bump bundle version number.
|
2011-12-05 23:38:58 -08:00 |
|
Nick Martin
|
b3c83c994a
|
Bump versions of old packages.
|
2011-12-05 23:38:37 -08:00 |
|
Nick Martin
|
7fc593034f
|
Add new packages.
|
2011-12-05 23:38:06 -08:00 |
|
Nick Martin
|
65ee4902a7
|
Update to Node 0.6.5. This now comes with npm, so we no longer need to build that separately.
|
2011-12-05 23:37:35 -08:00 |
|
Nick Martin
|
d69c2d1f19
|
Initial import from old busted repo.
|
2011-11-17 18:35:20 -08:00 |
|