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

..

.meteor

Rename .skybreak directories.

2012-01-04 21:27:14 -08:00

client

Merge branch 'master' into meteor

2012-01-18 16:14:54 -08:00

public

move examples into main repo

2011-12-07 21:22:47 -08:00

server

perl -pi -e 's/Sky/Meteor/g' **/*

2012-01-04 20:52:46 -08:00

model.js

perl -pi -e 's/Sky/Meteor/g' **/*

2012-01-04 20:52:46 -08:00