tl;dr:
- Import other repos as branches
- Move the files in the other repos into subdirectories for each project
- Rebase the other repo branches onto the master
- Merge everything into master in order
Note: placeholders are in angle brackets.
/*?sr/bin/env go run "$0" "$@"; exit $? #*/ | |
// This is actually not a shebang, the first line is both valid shell script and valid go code | |
// Just run: chmod +x pass.go; ./pass.go | |
package main | |
import ( | |
"bufio" | |
"crypto/sha256" | |
"encoding/base64" | |
"fmt" |
diff --git src/mumble/DirectSound.cpp src/mumble/DirectSound.cpp | |
index fb2b1d10..238fd853 100644 | |
--- src/mumble/DirectSound.cpp | |
+++ src/mumble/DirectSound.cpp | |
@@ -115,7 +115,7 @@ static BOOL CALLBACK DSEnumProc(LPGUID lpGUID, const WCHAR* lpszDesc, | |
const QList<audioDevice> DXAudioOutputRegistrar::getDeviceChoices() { | |
QList<dsDevice> qlOutput; | |
- qlOutput << dsDevice(DXAudioOutput::tr("Default DirectSound Voice Output"), DSDEVID_DefaultVoicePlayback); | |
+ qlOutput << dsDevice(DXAudioOutput::tr("Default DirectSound Voice Output"), DSDEVID_DefaultPlayback); |
" Optional plugin manager see: https://github.com/junegunn/vim-plug | |
" Do this first so we can overwrite anything it does after | |
"call plug#begin('~/.vim/plugged') | |
" Automatically source .local.vimrc files in directories you open | |
"Plug 'thinca/vim-localrc' | |
"call plug#end() | |
set title " Set terminal title | |
set mouse=a " Turn on mouse support | |
set undolevels=1000 |
[Desktop Entry] | |
Name=vim | |
Comment=Edit text files | |
Exec=vim %U | |
Terminal=true | |
Type=Application | |
MimeType=text/plain; | |
Actions=new-window;new-document; | |
Keywords=Text;Editor;Plaintext;Write; | |
Icon=gvim |
ab
a|b
. In most regex librariesa*
////////////////////////////////////////////// | |
// // | |
// MathClass: // | |
// version = 0.01 planning // | |
// modified = 08/09/2010 // | |
// license = GPL // | |
// // | |
////////////////////////////////////////////// | |
TODO: |
@echo off | |
rem Set up the Visual Studio 2013 compiler environment variables | |
call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x64 | |
cl -c lib.cpp | |
cl runner.cpp /link user32.lib |
/** | |
* The MIT License (MIT) | |
* | |
* Copyright (c) 2015 Andrew Kallmeyer | |
* | |
* Permission is hereby granted, free of charge, to any person obtaining a copy | |
* of this software and associated documentation files (the "Software"), to deal | |
* in the Software without restriction, including without limitation the rights | |
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
* copies of the Software, and to permit persons to whom the Software is |
#!/bin/sh | |
echo "CPU Model: `grep -m1 'model name' /proc/cpuinfo | cut -d' ' -f3- | tr -s ' '`" | |
echo "CPU/Core Speed (MHz): `grep -m1 'cpu MHz' /proc/cpuinfo | cut -d' ' -f3` MHz" | |
echo "RAM: `grep 'MemTotal' /proc/meminfo | awk '{ print $2,$3 }'`" | |
echo "Operating System: `uname -sr`" | |
echo "Interconnect: N/A" | |
echo "g++ version: `g++ --version | head -1`" | |
echo "javac version: `javac -version 2>&1`" | |
echo "icpc version: `icpc --version | head -1`" |