diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2015-01-23 01:36:12 -0800 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2015-01-23 01:42:56 -0800 |
| commit | 98c4b1ae856ce02e6b1e348365cef89de6d06322 (patch) | |
| tree | 065c0354540a72d9d6fbd0948b946b5fb10b8ada | |
| parent | 558b029b216525ca4825b39de79e5d6912957331 (diff) | |
| download | tizen-distro-98c4b1ae856ce02e6b1e348365cef89de6d06322.tar.gz tizen-distro-98c4b1ae856ce02e6b1e348365cef89de6d06322.tar.bz2 tizen-distro-98c4b1ae856ce02e6b1e348365cef89de6d06322.zip | |
tizen-distro: pull meta-tizen from "master" branch
As discussed in https://bugs.tizen.org/jira/browse/TC-1964 using
the "master" branch and not maintaining a "tizen" branch with
identical content for meta-tizen makes more sense.
(cherry picked from commit 4a7b826daea8373bbc2845a49a33fc5be24af5b8)
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
| -rw-r--r-- | conf/combo-layer.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/combo-layer.conf b/conf/combo-layer.conf index dbcf27b3c2..6bc7a813ca 100644 --- a/conf/combo-layer.conf +++ b/conf/combo-layer.conf @@ -30,5 +30,5 @@ last_revision = 8b040e58b263741ea19e1826308e22ab3cae585b src_uri = git://review.tizen.org/scm/bb/meta-tizen dest_dir = meta-tizen hook = conf/combo-layerhook-meta-tizen.sh -branch = tizen +branch = master last_revision = |