[Commits] [fluid-project/infusion] f98a64: Merge branch 'master' into FLUID-4249

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion

  Commit: f98a643b751a004556aebf75736875b5cea7c6be
      https://github.com/fluid-project/infusion/commit/f98a643b751a004556aebf75736875b5cea7c6be
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2011-09-30 (Fri, 30 Sep 2011)

  Changed paths:
    M ReleaseNotes.txt
  M src/webapp/components/uiOptions/js/UIEnhancer.js
  M src/webapp/components/uploader/js/FileQueue.js
  M src/webapp/components/uploader/js/HTML5UploaderSupport.js
  M src/webapp/components/uploader/js/Uploader.js
  M src/webapp/demos/renderer/demo.html
  M src/webapp/demos/reorderer/layoutReorderer/js/layoutReordererDemo.js
  M src/webapp/framework/core/js/Fluid.js
  M src/webapp/tests/component-tests/uiOptions/html/UIEnhancer-test.html
  M src/webapp/tests/component-tests/uiOptions/js/UIEnhancerTests.js
  M src/webapp/tests/component-tests/uploader/html/Uploader-test.html
  M src/webapp/tests/component-tests/uploader/js/UploaderTests.js
  M src/webapp/tests/manual-tests/js/simple-progress.js

  Log Message:
  -----------
  Merge branch 'master' into FLUID-4249


  Commit: be99e65f81a395406e2a5b092051e457bc0db73d
      https://github.com/fluid-project/infusion/commit/be99e65f81a395406e2a5b092051e457bc0db73d
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2011-09-30 (Fri, 30 Sep 2011)

  Changed paths:
    M build-scripts/build.properties
  M pom.xml
  M project.xml
  M src/webapp/tests/manual-tests/html/versioning.html

  Log Message:
  -----------
  FLUID-4259: Removed "-SNAPSHOT"

Removed the the "-SNAPSHOT" that had been there to indicate in
development work.


  Commit: a612d15b3344133c65f390659ef309dfcd8aeff8
      https://github.com/fluid-project/infusion/commit/a612d15b3344133c65f390659ef309dfcd8aeff8
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2011-09-30 (Fri, 30 Sep 2011)

  Changed paths:
    M build-scripts/build.properties
  M pom.xml
  M project.xml
  M src/webapp/framework/core/js/Fluid.js
  M src/webapp/tests/manual-tests/html/versioning.html

  Log Message:
  -----------
  Merge remote-tracking branch 'jobara/FLUID-4249'

* jobara/FLUID-4249:
  FLUID-4259: Removed "-SNAPSHOT"
  FLUID-4249: Updating version numbers to 1.4


Compare: https://github.com/fluid-project/infusion/compare/0302de5...a612d15