Since your files are not yet committed in branch1:
git stash
git checkout branch2
git stash pop
or
// | |
// This sketch will print some of interesting predefined constants to Serial. | |
// | |
// For more information, look at | |
// http://electronics4dogs.blogspot.com/2011/01/arduino-predefined-constants.html | |
// helper macro | |
#define LINE(name,val) Serial.print(name); Serial.print("\t"); Serial.println(val); | |
void setup() |
Function::define = (prop, desc) -> | |
Object.defineProperty this.prototype, prop, desc | |
class GetterSetterTest | |
constructor: (@_obj = {}) -> | |
# 'obj' is defined via the prototype, the definition proxied through | |
# to 'Object.defineProperty' via a function called 'define' providing | |
# some nice syntactic sugar. Remember, the value of '@' is | |
# GetterSetterTest itself when used in the body of it's class definition. |
beepwhenup () { | |
echo 'Enter host you want to ping:'; read PHOST; | |
if [[ "$PHOST" == "" ]]; | |
then exit; fi; | |
while true; | |
do ping -c1 -W2 $PHOST 2>&1 >/dev/null; | |
if [[ "$?" == "0" ]]; | |
then for j in $(seq 1 4); | |
do beep; |
yourApp.filter('orderObjectBy', function() { | |
return function(items, field, reverse) { | |
var filtered = []; | |
angular.forEach(items, function(item) { | |
filtered.push(item); | |
}); | |
filtered.sort(function (a, b) { | |
return (a[field] > b[field] ? 1 : -1); | |
}); | |
if(reverse) filtered.reverse(); |
Unfortunately, the Cisco AnyConnect client for Mac conflicts with Pow. And by "conflicts", I mean it causes a grey-screen-of-death kernel panic anytime you connect to the VPN and Pow is installed.
As an alternative, there is OpenConnect, a command-line client for Cisco's AnyConnect SSL VPN.
Here's how to get it set up on Mac OS X:
OpenConnect can be installed via homebrew:
brew update
brew install openconnect
1. Install openconnect via | |
sudo brew install openconnect | |
2. Install tuntap | |
sudo brew install tuntap | |
-> add to startup | |
3. Install some kind of script executor on wlan change | |
run vpn-script with credentials |
Download newest OpenCV 2.4.7.2 from
git clone https://github.com/Itseez/opencv/commit/8f10ca5180d3c62e97f6a2099b5beb225b7df26b
(source) https://github.com/Homebrew/homebrew/wiki/Custom-GCC-and-cross-compilers