| 2014-07-10 | 
              
                Merge branch 'dev'
                
                  ... Conflicts:
	bin/pixi.dev.js
	bin/pixi.dev.js.map
	bin/pixi.js
	bower.json
	docs/api.js
	docs/classes/AbstractFilter.html
	docs/classes/AjaxRequest.html
	docs/classes/AlphaMaskFilter.html
	docs/classes/AssetLoader.html
	docs/classes/AtlasLoader.html
	docs/classes/BaseTexture.html
	docs/classes/BitmapFontLoader.html
	docs/classes/BitmapText.html
	docs/classes/BlurFilter.html
	docs/classes/CanvasGraphics.html
	docs/classes/CanvasMaskManager.html
	docs/classes/CanvasRenderer.html
	docs/classes/CanvasTinter.html
	docs/classes/Circle.html
	docs/classes/ColorMatrixFilter.html
	docs/classes/ColorStepFilter.html
	docs/classes/DisplacementFilter.html
	docs/classes/DisplayObject.html
	docs/classes/DisplayObjectContainer.html
	docs/classes/DotScreenFilter.html
	docs/classes/Ellipse.html
	docs/classes/EventTarget.html
	docs/classes/FilterTexture.html
	docs/classes/Graphics.html
	docs/classes/GrayFilter.html
	docs/classes/ImageLoader.html
	docs/classes/InteractionData.html
	docs/classes/InteractionManager.html
	docs/classes/InvertFilter.html
	docs/classes/JsonLoader.html
	docs/classes/MovieClip.html
	docs/classes/NormalMapFilter.html
	docs/classes/PixelateFilter.html
	docs/classes/PixiFastShader.html
	docs/classes/PixiShader.html
	docs/classes/Point.html
	docs/classes/PolyK.html
	docs/classes/Polygon.html
	docs/classes/PrimitiveShader.html
	docs/classes/Rectangle.html
	docs/classes/Rope.html
	docs/classes/SepiaFilter.html
	docs/classes/Spine.html
	docs/classes/Sprite.html
	docs/classes/SpriteBatch.html
	docs/classes/SpriteSheetLoader.html
	docs/classes/Stage.html
	docs/classes/Strip.html
	docs/classes/Text.html
	docs/classes/Texture.html
	docs/classes/TilingSprite.html
	docs/classes/TwistFilter.html
	docs/classes/WebGLFilterManager.html
	docs/classes/WebGLGraphics.html
	docs/classes/WebGLMaskManager.html
	docs/classes/WebGLRenderer.html
	docs/classes/WebGLShaderManager.html
	docs/classes/WebGLSpriteBatch.html
	docs/classes/autoDetectRenderer.html
	docs/classes/getRecommendedRenderer.html
	docs/data.json
	docs/files/src_pixi_InteractionData.js.html
	docs/files/src_pixi_InteractionManager.js.html
	docs/files/src_pixi_Intro.js.html
	docs/files/src_pixi_Outro.js.html
	docs/files/src_pixi_Pixi.js.html
	docs/files/src_pixi_core_Circle.js.html
	docs/files/src_pixi_core_Ellipse.js.html
	docs/files/src_pixi_core_Matrix.js.html
	docs/files/src_pixi_core_Point.js.html
	docs/files/src_pixi_core_Polygon.js.html
	docs/files/src_pixi_core_Rectangle.js.html
	docs/files/src_pixi_display_DisplayObject.js.html
	docs/files/src_pixi_display_DisplayObjectContainer.js.html
	docs/files/src_pixi_display_MovieClip.js.html
	docs/files/src_pixi_display_Sprite.js.html
	docs/files/src_pixi_display_SpriteBatch.js.html
	docs/files/src_pixi_display_Stage.js.html
	docs/files/src_pixi_extras_Rope.js.html
	docs/files/src_pixi_extras_Spine.js.html
	docs/files/src_pixi_extras_Strip.js.html
	docs/files/src_pixi_extras_TilingSprite.js.html
	docs/files/src_pixi_filters_AbstractFilter.js.html
	docs/files/src_pixi_filters_AlphaMaskFilter.js.html
	docs/files/src_pixi_filters_BlurFilter.js.html
	docs/files/src_pixi_filters_BlurXFilter.js.html
	docs/files/src_pixi_filters_BlurYFilter.js.html
	docs/files/src_pixi_filters_ColorMatrixFilter.js.html
	docs/files/src_pixi_filters_ColorStepFilter.js.html
	docs/files/src_pixi_filters_CrossHatchFilter.js.html
	docs/files/src_pixi_filters_DisplacementFilter.js.html
	docs/files/src_pixi_filters_DotScreenFilter.js.html
	docs/files/src_pixi_filters_FilterBlock.js.html
	docs/files/src_pixi_filters_GrayFilter.js.html
	docs/files/src_pixi_filters_InvertFilter.js.html
	docs/files/src_pixi_filters_NormalMapFilter.js.html
	docs/files/src_pixi_filters_PixelateFilter.js.html
	docs/files/src_pixi_filters_RGBSplitFilter.js.html
	docs/files/src_pixi_filters_SepiaFilter.js.html
	docs/files/src_pixi_filters_SmartBlurFilter.js.html
	docs/files/src_pixi_filters_TwistFilter.js.html
	docs/files/src_pixi_loaders_AssetLoader.js.html
	docs/files/src_pixi_loaders_AtlasLoader.js.html
	docs/files/src_pixi_loaders_BitmapFontLoader.js.html
	docs/files/src_pixi_loaders_ImageLoader.js.html
	docs/files/src_pixi_loaders_JsonLoader.js.html
	docs/files/src_pixi_loaders_SpineLoader.js.html
	docs/files/src_pixi_loaders_SpriteSheetLoader.js.html
	docs/files/src_pixi_primitives_Graphics.js.html
	docs/files/src_pixi_renderers_canvas_CanvasGraphics.js.html
	docs/files/src_pixi_renderers_canvas_CanvasRenderer.js.html
	docs/files/src_pixi_renderers_canvas_utils_CanvasMaskManager.js.html
	docs/files/src_pixi_renderers_canvas_utils_CanvasTinter.js.html
	docs/files/src_pixi_renderers_webgl_WebGLRenderer.js.html
	docs/files/src_pixi_renderers_webgl_shaders_PixiFastShader.js.html
	docs/files/src_pixi_renderers_webgl_shaders_PixiShader.js.html
	docs/files/src_pixi_renderers_webgl_shaders_PrimitiveShader.js.html
	docs/files/src_pixi_renderers_webgl_shaders_StripShader.js.html
	docs/files/src_pixi_renderers_webgl_utils_FilterTexture.js.html
	docs/files/src_pixi_renderers_webgl_utils_WebGLFastSpriteBatch.js.html
	docs/files/src_pixi_renderers_webgl_utils_WebGLFilterManager.js.html
	docs/files/src_pixi_renderers_webgl_utils_WebGLGraphics.js.html
	docs/files/src_pixi_renderers_webgl_utils_WebGLMaskManager.js.html
	docs/files/src_pixi_renderers_webgl_utils_WebGLShaderManager.js.html
	docs/files/src_pixi_renderers_webgl_utils_WebGLShaderUtils.js.html
	docs/files/src_pixi_renderers_webgl_utils_WebGLSpriteBatch.js.html
	docs/files/src_pixi_text_BitmapText.js.html
	docs/files/src_pixi_text_Text.js.html
	docs/files/src_pixi_textures_BaseTexture.js.html
	docs/files/src_pixi_textures_RenderTexture.js.html
	docs/files/src_pixi_textures_Texture.js.html
	docs/files/src_pixi_utils_Detector.js.html
	docs/files/src_pixi_utils_EventTarget.js.html
	docs/files/src_pixi_utils_Polyk.js.html
	docs/files/src_pixi_utils_Utils.js.html
	docs/index.html
	docs/modules/PIXI.html
	package.json
	src/pixi/Pixi.js 
                  
                  mathew groves
                  committed 
  
    
      on 10 Jul 2014
    
  
                  
                 | 
        
            
          | 
              
              
                Republished files
                
                  ... updated bower and doc versions
republished docs
republished main files 
                  
                  mathew groves
                  committed 
  
    
      on 10 Jul 2014
    
  
                  
                 | 
        
    
      
        | 2014-04-24 | 
              
              
                updated docs
                
                 
                  
                  mathew groves
                  committed 
  
    
      on 24 Apr 2014
    
  
                  
                 | 
        
    
      
        | 2014-03-30 | 
              
              
                Generated Docs
                
                 
                  
                  Mat Groves
                  committed 
  
    
      on 30 Mar 2014
    
  
                  
                 | 
        
    
      
        | 2014-01-27 | 
              
              
                Docs updated
                
                  ... Fixed issue where alpha not being set correctly in canvas spriteBatch
Fixed issue where previous stage events did not get removed correctly 
                  
                  Mat Groves
                  committed 
  
    
      on 27 Jan 2014
    
  
                  
                 | 
        
    
      
        | 2014-01-05 | 
              
              
                Fixed bug where setText not working correctly
                
                  ... Docs updated 
                  
                  Mat Groves
                  committed 
  
    
      on 5 Jan 2014
    
  
                  
                 | 
        
    
      
        | 2014-01-01 | 
              
              
                Fixed graphics bug + updated docs
                
                  ... Fixed issue with getBounds being incorrect for graphics
Updated docs
Linted code 
                  
                  Mat Groves
                  committed 
  
    
      on 1 Jan 2014
    
  
                  
                 | 
        
    
      
        | 2013-11-02 | 
              
              
                Docs updated
                
                 
                  
                  Mat Groves
                  committed 
  
    
      on 2 Nov 2013
    
  
                  
                 | 
        
    
      
        | 2013-07-02 | 
              
              
                Removed Some debbuging code for masks
                
                 
                  
                  Mat Groves
                  committed 
  
    
      on 2 Jul 2013
    
  
                  
                 | 
        
            
          | 
              
              
                Docs updated Builds updated
                
                 
                  
                  Mat Groves
                  committed 
  
    
      on 2 Jul 2013
    
  
                  
                 | 
        
    
      
        | 2013-06-22 | 
              
              
                Docs updated
                
                  ... example updated
misplaced files removed 
                  
                  Mat Groves
                  committed 
  
    
      on 22 Jun 2013
    
  
                  
                 | 
        
    
      
        | 2013-06-21 | 
              
              
                Graphics shape fill added
                
                  ... shaders optimised - removed need for 4x4 matrix
draw elipse added
any shape can now be filled 
                  
                  Mat Groves
                  committed 
  
    
      on 21 Jun 2013
    
  
                  
                 | 
        
    
      
        | 2013-06-20 | 
              
              
                Src folder restructured
                
                 
                  
                  Mat Groves
                  committed 
  
    
      on 20 Jun 2013
    
  
                  
                 |