Egil Moeller ce5d2d8685 Merge branch 'pita' ... Resolved conflicts: .gitignore src/static/js/ace.js src/static/js/ace2_inner.js src/static/js/broadcast.js src/static/js/domline.js src/static/pad.html src/static/timeslider.html Ignored conflicts (please merge manually later): node/server.js src/node/utils/Minify.js		2012-03-02 22:00:20 +01:00
..
loadTesting	add stuff for how to do load testing	2012-02-25 16:54:27 +00:00
buildForWindows.sh	updated nodejs windows version to 0.6.5	2011-12-04 19:05:33 +01:00
checkPad.js	Removed CommonCode entierly	2012-02-28 21:19:10 +01:00
convert.js	Removed CommonCode entierly	2012-02-28 21:19:10 +01:00
convertSettings.json.template	Fixed some problems with the database convertion	2011-11-25 17:56:50 -08:00
debugRun.sh	The big rename of pluginbs from pluginomatic to ep	2012-02-26 13:54:32 +01:00
extractPadData.js	Added a extractPadData Script	2011-11-27 05:32:31 +00:00
installDeps.sh	The big rename of pluginbs from pluginomatic to ep	2012-02-26 13:54:32 +01:00
jshint.sh	Added a jshint binary	2012-01-22 14:56:08 +01:00
run.sh	The big rename of pluginbs from pluginomatic to ep	2012-02-26 13:54:32 +01:00
safeRun.sh	fixed issue # 64, making the shell scripts more portable (for OS X)	2011-08-03 23:08:27 +02:00