summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge remote-tracking branch 'gum/master'lassulus2018-06-283-1/+104
|\| | | |
| * | | | ma hub: initmakefu2018-06-281-0/+102
| * | | | ma source: bump to latest sourcemakefu2018-06-281-1/+1
| * | | | ma git: add fenkinsmakefu2018-06-261-0/+1
* | | | | cholerab: 4031072 -> 25d7ef05lassulus2018-06-281-2/+2
* | | | | Merge remote-tracking branch 'prism/staging/jeschli'lassulus2018-06-286-68/+140
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | j bln: fix xserver servicejeschli2018-06-271-8/+17
| | |_|/ | |/| |
| * | | j: services.xserver removed from 2configjeschli2018-06-271-20/+0
| * | | j vim: +fileline ; cosmeticsjeschli2018-06-271-12/+22
| * | | j brauerei: xserverjeschli2018-06-271-21/+16
| * | | j brauerei: vagrant fixjeschli2018-06-271-2/+12
| * | | j brauerei: +vagrantjeschli2018-06-191-0/+1
| * | | Merge remote-tracking branch 'origin/staging/jeschli'jeschli2018-06-19199-1882/+2651
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/master'jeschli2018-06-19140-926/+1349
| | |\ \ \
| | * | | | j bln: -hipchatjeschli2018-06-191-1/+0
| | * | | | j bln: +debian efi bootentryjeschli2018-06-191-1/+15
| | * | | | j bln: +dcso-vpnjeschli2018-06-191-0/+44
| * | | | | j brauerei: +evincejeschli2018-06-191-0/+1
| * | | | | j xmonad: +dmenujeschli2018-06-191-2/+5
| * | | | | j xmonad: setWMName "LG3D"jeschli2018-06-191-1/+2
| * | | | | j brauerei: +elixir +elmjeschli2018-06-191-0/+2
| * | | | | j brauerei: wpa_supplicant -> networkmanagerjeschli2018-06-191-2/+3
| * | | | | j brauerei: +virtualboxjeschli2018-06-191-0/+2
| * | | | | j bln: +vagrantjeschli2018-06-191-0/+1
* | | | | | Merge remote-tracking branch 'prism/makefu'lassulus2018-06-2812-40/+494
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | ma gum.r: remove retroshare importmakefu2018-06-251-1/+1
| * | | | | ma nextgum.r: in preparation to move nextgum -> gummakefu2018-06-246-2/+342
| * | | | | ma kexec: init dummy host for deploying kexec tarballsmakefu2018-06-242-0/+28
| * | | | | Merge branch 'master' of prism:stockholmmakefu2018-06-2433-343/+74
| |\ \ \ \ \
| * | | | | | ma source: cherry-pick forecastio and uhub/sqlitemakefu2018-06-241-1/+3
| * | | | | | onebutton.r: add mpc-bootermakefu2018-06-242-1/+31
| * | | | | | nextgum.r: initmakefu2018-06-241-0/+32
| * | | | | | ma gum.r: split sw/hw configmakefu2018-06-172-36/+58
* | | | | | | l xjails: add vglrun optionlassulus2018-06-271-2/+8
* | | | | | | l wine: add winetrickslassulus2018-06-271-0/+1
* | | | | | | l serveWordpress: addSSL -> forceSSLlassulus2018-06-271-1/+1
* | | | | | | l vbox: add to group videolassulus2018-06-271-1/+1
* | | | | | | l xmonad: reenable rhombuslassulus2018-06-271-3/+23
* | | | | | | l urxvt: save more lineslassulus2018-06-271-1/+1
* | | | | | | l repo-sync: sync nix-writerslassulus2018-06-271-0/+1
* | | | | | | l repo-sync: lass-mors is admin userlassulus2018-06-271-0/+1
* | | | | | | l reaktor-coders: add !shrug commandlassulus2018-06-271-0/+6
* | | | | | | l logf: mails now arrive on bluelassulus2018-06-271-1/+1
* | | | | | | l git: set xmonad-stockholm as publiclassulus2018-06-271-0/+4
* | | | | | | l dcso-dev: add nightwatch stufflassulus2018-06-271-1/+5
* | | | | | | l dunst: set timeout to 1lassulus2018-06-271-3/+3
* | | | | | | l urxvt: add font-resizinglassulus2018-06-272-0/+7
* | | | | | | l ftb: mesa -> mesa_glulassulus2018-06-271-2/+2
* | | | | | | l prism.r xmonad-stockholm: add add jeschli push accesslassulus2018-06-271-0/+10
* | | | | | | cholerab: 8ac2258 -> 4031072lassulus2018-06-271-2/+2