Skip to content

Commit

Permalink
adding license, all builds
Browse files Browse the repository at this point in the history
  • Loading branch information
markmarkoh committed Nov 14, 2012
1 parent 90bc82a commit 1207169
Show file tree
Hide file tree
Showing 12 changed files with 98 additions and 39,595 deletions.
8 changes: 8 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
The MIT License (MIT)
Copyright (c) 2012 Mark DiMarco

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6 changes: 5 additions & 1 deletion build/wrap_end.frag
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@
return require('app/views/MapUsOnly');
//>>includeEnd("usOnly")

//>>includeStart("notUsOnly", !pragmas.usOnly)
//>>includeStart("notUsOnly", !pragmas.usOnly && !pragmas.worldAndUs)
return require('app/views/MapCountriesOnly');
//>>includeEnd("notUsOnly")

//>>includeStart("worldAndUs", pragmas.worldAndUs)
return require('app/views/MapWorldAndUsStates');
//>>includeEnd("worldAndUs")
}));
325 changes: 1 addition & 324 deletions dist/almondLib.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 1 addition & 26 deletions dist/app.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1207169

Please sign in to comment.