~ubuntu-branches/ubuntu/oneiric/gjs/oneiric

Viewing all changes in revision 46.

  • Committer: Bazaar Package Importer
  • Author(s): Laurent Bigonville
  • Date: 2011-07-22 21:56:42 UTC
  • mfrom: (1.5.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110722215642-6z9ziusn5bty7m1i
Tags: 1.29.0-1ubuntu1
* Merge with Debian unstable, remaining Ubuntu changes:
  - build against public api stable mozjs185 and remove xulrunner deps
* debian/patches/00git_support_mozjs185.patch,
  00git_conditionally_adapt_to_JS_BufferIsCompilableUnit_changes.patch,
  00git_conditionally_adapt_to_JS_DestroyScript_removal.patch:
  Drop, applied upstream.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: