Merge branch 'master' into tsc-1.6

This commit is contained in:
vvakame
2015-08-29 00:00:42 +09:00
2 changed files with 2 additions and 6 deletions
+1 -2
View File
@@ -98,5 +98,4 @@ declare module loglevel {
export function noConflict():any;
}
declare
var log:typeof loglevel;
declare var log:typeof loglevel;
+1 -4
View File
@@ -482,7 +482,4 @@ declare module DDS {
* Defines the core Vortex-Web-Client javascript library. It includes the JavaScript API for DDS. This API allows
* web applications to share data among them as well as with native DDS applications.
*/
declare
var dds:typeof DDS;
declare var dds:typeof DDS;