| 
            
            
              
                 Chad Engler
                 authored 
  
    
      on 8 Dec 2013 | 
      
        
          |  | .. |  |  | 
      
      
        
          |  | core | Merge #302 from @drkibitz, and fix conflicts | 11 years ago | 
      
        
          |  | display | Merge #304 from @drkibitz, and fix conflicts | 11 years ago | 
      
        
          |  | extras | Merge #304 from @drkibitz, and fix conflicts | 11 years ago | 
      
        
          |  | filters | Merge #304 from @drkibitz, and fix conflicts | 11 years ago | 
      
        
          |  | loaders | Merge #304 from @drkibitz, and fix conflicts | 11 years ago | 
      
        
          |  | primitives | Merge #304 from @drkibitz, and fix conflicts | 11 years ago | 
      
        
          |  | renderers | Merge #304 from @drkibitz, and fix conflicts | 11 years ago | 
      
        
          |  | text | Merge #304 from @drkibitz, and fix conflicts | 11 years ago | 
      
        
          |  | textures | Merge #304 from @drkibitz, and fix conflicts | 11 years ago | 
      
        
          |  | utils | Merge #304 from @drkibitz, and fix conflicts | 11 years ago | 
      
        
          |  | InteractionManager.js | Merge #302 from @drkibitz, and fix conflicts | 11 years ago | 
      
        
          |  | Intro.js | Squashed commit of the following (jshint): | 12 years ago | 
      
        
          |  | Outro.js | Add AMD export, fixes #267 | 12 years ago | 
      
        
          |  | Pixi.js | a shitload of doc updates | 12 years ago |