Skip to content

Instantly share code, notes, and snippets.

View superdump's full-sized avatar

Robert Swain superdump

View GitHub Profile
@superdump
superdump / gist:3e3ba9c566bda4046813
Created March 27, 2015 09:43
Rebase PR on top of master and merge --ff-only. a.k.a. No GitHub, I do not want unreadable git history due to merges.
# Merge GitHub pull request on top of the `master` branch
mpr = "!f() { \
if [ $(printf \"%s\" \"$1\" | grep '^[0-9]\\+$' > /dev/null; printf $?) -eq 0 ]; then \
git fetch origin refs/pull/$1/head:pr/$1 && \
git rebase master pr/$1 && \
git checkout master && \
git merge --ff-only pr/$1 && \
git branch -D pr/$1; \
fi \
}; f"
From c981f8885b2b3e9fde1b217369f7cae57d5dffe1 Mon Sep 17 00:00:00 2001
From: Robert Swain <robert.swain@ericsson.com>
Date: Mon, 14 Sep 2015 20:46:19 +0200
Subject: [PATCH 1/2] Add support for OS X 10.11 El Capitan
---
cerbero/enums.py | 1 +
cerbero/utils/__init__.py | 4 +++-
config/darwin.config | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
From d9dfc2fe3983325e8752ef739a48c72bc75099f5 Mon Sep 17 00:00:00 2001
From: Robert Swain <robert.swain@ericsson.com>
Date: Thu, 17 Dec 2015 21:32:53 +0100
Subject: [PATCH] Add support for iOS 9.2
---
cerbero/enums.py | 1 +
config/ios.config | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
filebeat.yml configuration file (note: the various /rootfs are mounted into the container from the host as read-only volumes):
---
filebeat.prospectors:
- input_type: log
paths:
- /rootfs/var/log/*.log
- /rootfs/var/log/*/*.log
- input_type: log
paths:
diff --git a/local/owr_video_renderer.c b/local/owr_video_renderer.c
index 8f1ab14..8bd5a36 100644
--- a/local/owr_video_renderer.c
+++ b/local/owr_video_renderer.c
@@ -387,14 +387,25 @@ static GstElement *owr_video_renderer_get_element(OwrMediaRenderer *renderer, gu
}
/**
- * owr_video_renderer_set_request_context_callback: Configure the GClosure to
- * invoke when a GL context is required by the GStreamer pipeline running the
diff --git a/.eslintrc.js b/.eslintrc.js
index e6eb64a..9aa4cd2 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -4,13 +4,16 @@ module.exports = {
ecmaVersion: 6,
sourceType: "module",
ecmaFeatures: {
+ "jsx": true,
}
AFRAME.registerComponent('spherecube', {
schema: {
color: {type: 'color', default: '#FFF'},
radius: {type: 'number', default: '1'},
segments: {type: 'int', default: '8'},
},
init: function() {
const data = this.data;
const el = this.el;
this.geometry = new SphereCubeBufferGeometry(data.radius, data.segments);
createOffer: v=0
o=mozilla...THIS_IS_SDPARTA-52.0.2 1278190319635658274 0 IN IP4 0.0.0.0
s=-
t=0 0
a=fingerprint:sha-256 15:EB:38:50:FE:BC:52:22:E1:A9:4C:86:CB:27:A3:5E:EC:1D:4E:D7:26:AB:F0:FC:CB:61:69:92:41:B1:A7:B0
// Copyright 2017 Vector Creations Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
template <class T>
class WeightedGraph {
public:
friend std::ostream& operator<<(std::ostream& out,
const WeightedGraph<T>& g);
...
};
template <class T>