diff options
| author | Misko Hevery | 2010-03-22 15:46:52 -0700 |
|---|---|---|
| committer | Misko Hevery | 2010-03-22 15:46:52 -0700 |
| commit | d4ba33d075fea5e86963a9ff4982e433fc8c7968 (patch) | |
| tree | f09f67d52feb3544d5d86ad22a4c6613cf430f4e /src/directives.js | |
| parent | b4561ff951ff452e55e820f6f8344dc2668cfd90 (diff) | |
| parent | 5119c8a86fa2b8ce9d0f0c343b57dd96aa88ce8c (diff) | |
| download | angular.js-d4ba33d075fea5e86963a9ff4982e433fc8c7968.tar.bz2 | |
Merge branch 'directives' of github.com:angular/angular.js into directives
Diffstat (limited to 'src/directives.js')
| -rw-r--r-- | src/directives.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/directives.js b/src/directives.js index 8047cdbd..861805fe 100644 --- a/src/directives.js +++ b/src/directives.js @@ -123,3 +123,5 @@ angularDirective("watch", function(expression, element){ //widget related //ng-validate, ng-required, ng-formatter //ng-error + +//ng-scope ng-controller???? |