diff options
| author | hwc487 | 2012-02-23 15:21:56 -0800 |
|---|---|---|
| committer | hwc487 | 2012-02-23 15:21:56 -0800 |
| commit | 26bb2894c29d4608e843de01829d352dd3d00823 (patch) | |
| tree | c5a9d10976304fe5b3dec59f40977d8c72df57de /js/components/textfield.reel | |
| parent | 64280907f31e6f6e5659acb0893df3e0da5bb044 (diff) | |
| parent | 81ce79819ba574b03b46e91e9a153dab82b550cd (diff) | |
| download | ninja-26bb2894c29d4608e843de01829d352dd3d00823.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/Materials/PulseMaterial.js
js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/preloader/Preloader.js
Diffstat (limited to 'js/components/textfield.reel')
| -rwxr-xr-x | js/components/textfield.reel/textfield.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/textfield.reel/textfield.html b/js/components/textfield.reel/textfield.html index 73defabd..89adf776 100755 --- a/js/components/textfield.reel/textfield.html +++ b/js/components/textfield.reel/textfield.html | |||
| @@ -19,6 +19,6 @@ | |||
| 19 | </script> | 19 | </script> |
| 20 | </head> | 20 | </head> |
| 21 | <body> | 21 | <body> |
| 22 | <input id="textfield" class="textfield nj-skinned" type="text"> | 22 | <input id="textfield" class="nj-skinned" type="text"> |
| 23 | </body> | 23 | </body> |
| 24 | </html> \ No newline at end of file | 24 | </html> \ No newline at end of file |