← Back to branch summary

~matsubara/juju-gui/tarmac-test

« back to all changes in this revision

Viewing changes to bin/merge-files

  • Committer: Nicola Larosa
  • Date: 2013-05-16 14:28:29 UTC
  • mfrom: (649.2.12 export-ui)
  • mto: This revision was merged to the branch mainline in revision 666.
  • Revision ID: nicola.larosa@canonical.com-20130516142829-r9mk2sannjtpvtxg
Merge from lp:~bcsaller/juju-gui/export-ui

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/merge-files
81
81
    'app/assets/javascripts/prettify.js',
82
82
    'app/assets/javascripts/reconnecting-websocket.js',
83
83
    'app/assets/javascripts/resizing_textarea.js',
 
84
    'app/assets/javascripts/FileSaver.js',
84
85
    'app/assets/javascripts/sub-app.js',
85
86
    'app/assets/javascripts/unscaled-pack-layout.js'
86
87
  ]);