[Hawkular-commits] [hawkular/hawkular] 1f8240: HAWKULAR-46: Added handling of src files to gulp

[Mike Thompson]

  Branch: refs/heads/master
  Home:   https://github.com/hawkular/hawkular
  Commit: 1f8240cdbe7d62719999d31be3336de96f2cd1ea
      https://github.com/hawkular/hawkular/commit/1f8240cdbe7d62719999d31be3336de96f2cd1ea
  Author: Viliam Rockai <vrockai at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M ui/console/src/main/scripts/gulpfile.js
    M ui/console/src/main/scripts/package.json

  Log Message:
  -----------
  HAWKULAR-46: Added handling of src files to gulp

Conflicts:
	ui/console/src/main/scripts/gulpfile.js


  Commit: 0b93132e627648a753a2b6336c8c3ea081a15f23
      https://github.com/hawkular/hawkular/commit/0b93132e627648a753a2b6336c8c3ea081a15f23
  Author: Mike Thompson <mtho11 at users.noreply.github.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M ui/console/src/main/scripts/gulpfile.js
    M ui/console/src/main/scripts/package.json

  Log Message:
  -----------
  Merge pull request #42 from vrockai/HAWKULAR-46_master

HAWKULAR-46: Added handling of src files to gulp


Compare: https://github.com/hawkular/hawkular/compare/50ec7213d726...0b93132e6276