summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:krebscode/painloadlassulus2013-11-061-46/+56
|\
| * Merge branch 'master' of https://github.com/krebscode/painloadtv2013-11-063-2/+20
| |\
| * | ship build: load directives before build_depstv2013-11-061-8/+10
| * | ship build: inline make_*tv2013-11-061-31/+20
| * | ship build: purge make_sedscript_maker_shellscripttv2013-11-061-27/+20
| * | ship build: add defvartv2013-11-061-29/+21
| * | ship build: purge inittv2013-11-061-26/+17
| * | build ship: generate directives and input_parsertv2013-11-061-15/+58
* | | better csslassulus2013-11-061-3/+8
* | | webchat: clickable linkslassulus2013-11-061-3/+9
* | | webchat: move stuff to local_configlassulus2013-11-061-3/+3
| |/ |/|
* | webchat: local_config in .gitignorelassulus2013-11-061-0/+2
* | Merge branch 'master' of github.com:krebscode/painloadlassulus2013-11-067-33/+142
|\|
| * ship build: recursive deps resolvertv2013-11-061-6/+17
| * ship build: export debug=true for debug outputtv2013-11-061-2/+19
| * prepare all the travis for impactmakefu2013-11-051-1/+2
| * Merge branch 'master' of github.com:krebscode/painloadmakefu2013-11-0574-293/+1230
| |\
| | * ship build: modularize directive declstv2013-11-051-39/+36
| | * ship build: remove excessive spacetv2013-11-051-2/+2
| | * Merge branch 'master' of https://github.com/krebscode/painloadtv2013-11-058-0/+243
| | |\
| | * | ship build: add #@info directivetv2013-11-052-1/+17
| * | | add espeak smoke test for sttmakefu2013-11-051-0/+16
| * | | speech to text: initial commitmakefu2013-11-053-0/+51
* | | | webchat: fix package.jsonlassulus2013-11-061-1/+1
* | | | webchat: automatic reconnect after ping timeoutlassulus2013-11-061-1/+17
| |_|/ |/| |
* | | Merge branch 'master' of github.com:krebscode/painloadlassulus2013-11-055-8/+85
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of https://github.com/krebscode/painloadtv2013-11-053-258/+307
| |\ \
| * | | ship build: initial committv2013-11-055-8/+85
* | | | webchat: now in gitlassulus2013-11-058-0/+243
| |/ / |/| |
* | | make-realwallpaper fixed gcloud-distmaplassulus2013-11-051-1/+1
* | | Merge remote-tracking branch 'origin/master'lassulus2013-11-050-0/+0
|\ \ \
| * | | make-realwallpaper: write always to marker and sat fileslassulus2013-11-051-8/+4
* | | | make-realwallpaper: both default and normal verslassulus2013-11-051-5/+55
* | | | make-realwallpaper: removed ATV-4 from satslassulus2013-11-051-1/+0
* | | | make-realwallpaper: always write config fileslassulus2013-11-051-6/+2
|/ / /
* | | new_install.sh main function, fix tinc-prelassulus2013-11-051-244/+248
* | | make travis break visiblemakefu2013-11-051-1/+1
|/ /
* | sandbox -> .graveyardroot2013-11-0531-0/+0
* | //punani: RIPtv2013-11-059-0/+0
* | ship README: add titletv2013-11-051-0/+1
* | //shell: RIPtv2013-11-051-0/+0
* | Merge remote-tracking branch 'confmagic/master'tv2013-11-057-0/+210
|\ \
| * | add deploy scriptmakefu2013-11-024-1/+19
| * | require root for punani only when you actually do somethingroot2013-11-021-4/+4
| * | refactor punaniroot2013-11-021-72/+83
| * | porting punani to local_db from //punani/binmakefu2013-09-271-0/+93
| * | add develop scriptmakefu2013-09-271-0/+5
| * | add is_root to coremakefu2013-09-271-1/+3
| * | add network libsmakefu2013-09-271-0/+49
| * | add core libsmakefu2013-09-271-0/+32
| /