post merge fixes to straighten paths and fix mini_require

This commit is contained in:
Joe Walker 2011-03-17 13:07:27 +00:00
commit 667b11e013
3 changed files with 19 additions and 19 deletions

View file

@ -40,7 +40,7 @@ require({
demo: "../demo",
ace: "../lib/ace",
cockpit: "../support/cockpit/lib/cockpit",
pilot: "../support/pilot/lib/pilot"
pilot: "../support/cockpit/support/pilot/lib/pilot"
}
});