From: Martin Jansa <martin.jansa@gmail.com>
To: krzysztof.m.sywula@intel.com
Cc: openembedded-devel@lists.openembedded.org,
"Eric Bénard" <eric@eukrea.com>
Subject: Re: [dylan][PATCH] cloud9: merging sources list with master
Date: Thu, 30 Jan 2014 17:09:45 +0100 [thread overview]
Message-ID: <20140130160945.GT3718@jama> (raw)
In-Reply-To: <1391094865-10288-1-git-send-email-krzysztof.m.sywula@intel.com>
[-- Attachment #1: Type: text/plain, Size: 3880 bytes --]
On Thu, Jan 30, 2014 at 03:14:25PM +0000, krzysztof.m.sywula@intel.com wrote:
> From: Krzysztof Sywula <krzysztof.m.sywula@intel.com>
For dylan branch please Cc Eric Bénard <eric@eukrea.com>
and this would be better as 2 cherry-picks from master:
5baa832786ad67a3c69a9a2e64ba1da53662e5d4
07453a3a916686668c03e3e7727b9cfd54bdb621
and make sure they are in "dora" before "dylan"
>
> Signed-off-by: Krzysztof Sywula <krzysztof.m.sywula@intel.com>
> ---
> meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
> index 3300fd2..44b2142 100644
> --- a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
> +++ b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
> @@ -3,7 +3,7 @@ HOMEPAGE = "http://c9.io"
> LICENSE = "GPLv3"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018"
>
> -PR = "r4"
> +PR = "r5"
>
> # Nodejs-native for node-waf, nodejs4-native for the headers
> DEPENDS = "libxml2 nodejs-native nodejs4-native"
> @@ -16,12 +16,12 @@ SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
> git://github.com/ajaxorg/ace.wiki.git;destsuffix=git/support/ace/doc/wiki;name=acewiki \
> git://github.com/ajaxorg/apf.git;destsuffix=git/support/apf;name=apf \
> git://github.com/ajaxorg/async.js.git;destsuffix=git/support/asyncjs;name=asyncjs \
> - git://github.com/ajaxorg/connect.git;destsuffix=git/support/connect;name=connect \
> + git://github.com/ajaxorg/connect.git;destsuffix=git/support/connect;name=connect;branch=ajaxorg \
> git://github.com/jashkenas/coffee-script.git;destsuffix=git/support/connect/support/coffee-script;name=coffee-script \
> git://github.com/visionmedia/expresso.git;destsuffix=git/support/connect/support/expresso;name=expresso \
> git://github.com/visionmedia/node-jscoverage.git;destsuffix=git/support/connect/support/expresso/deps/jscoverage;name=jscoverage \
> git://github.com/cloudhead/less.js.git;destsuffix=git/support/connect/support/less;name=less \
> - git://github.com/visionmedia/sass.js.git;destsuffix=git/support/connect/support/sass;name=sass \
> + git://github.com/matehat/sass.js.git;destsuffix=git/support/connect/support/sass;name=sass \
> git://github.com/ajaxorg/jsDAV.git;destsuffix=git/support/jsdav;name=jsdav \
> git://github.com/fjakobs/async.js.git;destsuffix=git/support/jsdav/support/async.js;name=async-js \
> git://github.com/felixge/node-formidable.git;destsuffix=git/support/jsdav/support/formidable;name=formidable \
> @@ -29,7 +29,7 @@ SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
> git://github.com/Gozala/streamer.git;destsuffix=git/support/jsdav/support/jsftp/support/streamer;name=streamer \
> git://github.com/ajaxorg/node-sftp.git;destsuffix=git/support/jsdav/support/node-sftp;name=sftp \
> git://github.com/ajaxorg/lib-v8debug.git;destsuffix=git/support/lib-v8debug;name=lib-v8debug \
> - git://github.com/ajaxorg/socket.io.git;destsuffix=git/support/socket.io;name=socketio \
> + git://github.com/ajaxorg/socket.io.git;destsuffix=git/support/socket.io;name=socketio;branch=cadorn-upstream \
> git://github.com/LearnBoost/socket.io-client.git;destsuffix=git/support/socket.io-client;name=socketio-client \
> git://github.com/ajaxorg/treehugger.git;destsuffix=git/support/treehugger;name=treehugger \
> git://github.com/ajaxorg/UglifyJS.git;destsuffix=git/support/uglify-js;name=uglify-js \
> --
> 1.7.12.2
>
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
prev parent reply other threads:[~2014-01-30 16:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-30 15:14 [dylan][PATCH] cloud9: merging sources list with master krzysztof.m.sywula
2014-01-30 16:09 ` Martin Jansa [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140130160945.GT3718@jama \
--to=martin.jansa@gmail.com \
--cc=eric@eukrea.com \
--cc=krzysztof.m.sywula@intel.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.