gecko-dev/b2g
Gaia Pushbot 3a80018c1f Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/23c7f5bc5406
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #13393 from davidflanagan/bug915001

Merge pull request #13300 from davidflanagan/bug915001hd

========

https://hg.mozilla.org/integration/gaia-central/rev/1c8b364321f5
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #13300 from davidflanagan/bug915001hd

Bug 915001 - save edited images using tiles and display a progress bar r=hshih(cherry picked from commit d19550e2fb7331d5e4a54e8e998753378e7fd44a)

Conflicts:

	apps/gallery/index.html
	apps/gallery/js/ImageEditor.js

fix lint
2013-11-05 13:50:24 -08:00
..
app Merge mozilla-central and b2g-inbound 2013-10-29 16:34:46 +00:00
branding Bug 912293 - Remove now redundant boilerplate from Makefile.in. r=gps 2013-09-05 09:01:46 +09:00
chrome Backout 87b5e35236ef (bug 931746) breaks UI tests 2013-11-05 15:04:22 +08:00
components Bug 853356 - Part1 Add new permissions and prompt for mutiple permissions request. r=fabrice, felipc, wjohnston, mrbkap, jimm 2013-11-05 16:29:27 +08:00
config Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 2013-11-05 13:50:24 -08:00
gaia Bug 870406 part n - Move more CSRCS to moz.build. r=mshal 2013-11-01 10:30:45 +09:00
installer Bug 920551 - 2.h/2: fix dom/system/gonk/*. r=hsinyi,khuey 2013-10-29 16:12:45 +08:00
locales Bug 882186 - [System] Replace blue offline error page with new UX r=vingtetun,bz 2013-09-24 14:21:10 -07:00
test Bug 879666 - Upload new emulator to TBPL, a=test-only 2013-06-06 15:19:33 -07:00
app.mozbuild Bug 784841 - Part 20: Fixes to support building external projects; r=glandium 2013-02-28 12:56:40 +01:00
build.mk Bug 784841 - Part 18b: Convert /b2g; r=ted f=Ms2ger 2013-02-25 12:47:17 -08:00
confvars.sh Merging in version bump NO BUG 2013-10-28 13:37:48 -07:00
LICENSE Bug 759095 - upgrade license to MPL 2, and other licensing cleanups. 2012-05-29 16:52:43 +01:00
Makefile.in Bug 912293 - Remove now redundant boilerplate from Makefile.in. r=gps 2013-09-05 09:01:46 +09:00
moz.build Bug 855465 - Add emacs python mode comments to moz.build files; r=gps 2013-04-01 11:36:59 -07:00