Merge branch 'master' into rename-repo-url

This commit is contained in:
vvakame
2016-03-17 21:06:54 +09:00
1140 changed files with 179704 additions and 179635 deletions
+2 -2
View File
@@ -5,7 +5,7 @@
/// <reference path="../backbone/backbone.d.ts" />
declare module Giraffe {
declare namespace Giraffe {
interface GiraffeObject {
app: App;
@@ -141,7 +141,7 @@ declare module Giraffe {
start( options?:any ): App;
}
module Contrib {
namespace Contrib {
class Controller extends Backbone.Events implements GiraffeObject {
app: App;