diff options
Diffstat (limited to 'wayland-desktop.txt')
| -rw-r--r-- | wayland-desktop.txt | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/wayland-desktop.txt b/wayland-desktop.txt index fceefd67a45b..aee005b533da 100644 --- a/wayland-desktop.txt +++ b/wayland-desktop.txt @@ -25,15 +25,13 @@ or --ff-only on the command line to override the configured default per invocation. From https://github.com/epsilon-0/wayland-desktop - eac1273..f10239d master -> origin/master - * [new branch] waypipeTEST -> origin/waypipeTEST -Updating eac1273..f10239d + f10239d..11f6139 master -> origin/master +Updating f10239d..11f6139 Fast-forward - .travis.yml | 6 +++++- - .travis/travis_ci.sh | 6 +++--- - gui-libs/waypipe/metadata.xml | 6 +++--- - gui-libs/waypipe/waypipe-0.7.0.ebuild | 4 ++-- - 4 files changed, 13 insertions(+), 9 deletions(-) + .travis.yml | 24 +++++++----------------- + .travis.yml.old | 43 +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 50 insertions(+), 17 deletions(-) + create mode 100644 .travis.yml.old *** syncing wayland-desktop *** synced wayland-desktop * Sync succeeded |