diff options
| author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
| commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
| tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /node_modules/montage | |
| parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
| parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
| download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz | |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage')
105 files changed, 210 insertions, 210 deletions
diff --git a/node_modules/montage/core/converter/bytes-converter.js b/node_modules/montage/core/converter/bytes-converter.js index 84511924..17a4390c 100755 --- a/node_modules/montage/core/converter/bytes-converter.js +++ b/node_modules/montage/core/converter/bytes-converter.js | |||
| @@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
| 28 | POSSIBILITY OF SUCH DAMAGE. | 28 | POSSIBILITY OF SUCH DAMAGE. |
| 29 | </copyright> */ | 29 | </copyright> */ |
| 30 | /** | 30 | /** |
| 31 | @module montage/core/converter/bytes-converter | 31 | @module montage/core/converter/bytes-converter |
| 32 | @requires montage/core/core | 32 | @requires montage/core/core |
| 33 | @requires montage/core/converter/converter | 33 | @requires montage/core/converter/converter |
| 34 | @requires montage/core/converter/number-converter | 34 | @requires montage/core/converter/number-converter |
diff --git a/node_modules/montage/core/converter/currency-converter.js b/node_modules/montage/core/converter/currency-converter.js index ca32fe7e..712ce306 100755 --- a/node_modules/montage/core/converter/currency-converter.js +++ b/node_modules/montage/core/converter/currency-converter.js | |||
| @@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
| 28 | POSSIBILITY OF SUCH DAMAGE. | 28 | POSSIBILITY OF SUCH DAMAGE. |
| 29 | </copyright> */ | 29 | </copyright> */ |
| 30 | /** | 30 | /** |
| 31 | @module montage/core/converter/currency-converter | 31 | @module montage/core/converter/currency-converter |
| 32 | @requires montage/core/core | 32 | @requires montage/core/core |
| 33 | @requires montage/core/converter/converter | 33 | @requires montage/core/converter/converter |
| 34 | @requires montage/core/converter/number-converter | 34 | @requires montage/core/converter/number-converter |
diff --git a/node_modules/montage/core/converter/date-converter.js b/node_modules/montage/core/converter/date-converter.js index 38ad8f96..0c0ae09a 100755 --- a/node_modules/montage/core/converter/date-converter.js +++ b/node_modules/montage/core/converter/date-converter.js | |||
| @@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||