summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/krebscode/painloadtv2013-11-065-9/+11
|\
| * webchat: krebs now as backgroundlassulus2013-11-062-1/+10
| |
| * bling: delete blue krebslassulus2013-11-061-0/+0
| |
| * webchat: better krebslassulus2013-11-063-8/+1
| |
| * webchat: add spaces around hello arrowFelix Richter2013-11-061-1/+1
| |
* | ship: s/deploy/make {,inst}all {,dist}clean/tv2013-11-062-0/+32
| |
* | ship develop: RIPtv2013-11-061-0/+0
| |
* | ship: mv bin src && mv out tmptv2013-11-064-6/+6
|/
* ship build: s/macro_*/build_*_macro/gtv2013-11-061-3/+3
| | | | Without this the defmacro would have to do even more magic...^_^
* Merge branch 'master' of https://github.com/krebscode/painloadtv2013-11-062-3/+5
|\
| * Merge branch 'master' of github.com:krebscode/painloadlassulus2013-11-062-32/+25
| |\
| * | webchat: add redis as dependencylassulus2013-11-061-1/+2
| | |
| * | webchat: better outputlassulus2013-11-061-2/+3
| | |
* | | ship lib: remove crufttv2013-11-064-6/+2
| |/ |/|
* | ship deploy: reduce crufttv2013-11-061-6/+5
| |
* | Merge branch 'master' of https://github.com/krebscode/painloadtv2013-11-063-9/+20
|\|
| * Merge branch 'master' of github.com:krebscode/painloadlassulus2013-11-061-46/+56
| |\
| * | better csslassulus2013-11-061-3/+8
| | |
| * | webchat: clickable linkslassulus2013-11-061-3/+9
| | |
| * | webchat: move stuff to local_configlassulus2013-11-061-3/+3
| | |
* | | ship build: s/directive/macro/gtv2013-11-061-26/+20
| |/ |/|
* | Merge branch 'master' of https://github.com/krebscode/painloadtv2013-11-063-2/+20
|\|
| * webchat: local_config in .gitignorelassulus2013-11-061-0/+2
| |
| * Merge branch 'master' of github.com:krebscode/painloadlassulus2013-11-067-33/+142
| |\
| * | webchat: fix package.jsonlassulus2013-11-061-1/+1
| | |
| * | webchat: automatic reconnect after ping timeoutlassulus2013-11-061-1/+17
| | |
* | | ship build: load directives before build_depstv2013-11-061-8/+10
| | | | | | | | | | | | | | | Because build_deps requires #@include. This is required because build_deps requires the #@include directive.
* | | 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
| |/ |/|
* | 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
| |\|
| | * Merge branch 'master' of github.com:krebscode/painloadlassulus2013-11-055-8/+85
| | |\
| | * | webchat: now in gitlassulus2013-11-058-0/+243
| | | |
| * | | ship build: add #@info directivetv2013-11-052-1/+17
| | |/ | |/|
| * | Merge branch 'master' of https://github.com/krebscode/painloadtv2013-11-053-258/+307
| |\|
| | * make-realwallpaper fixed gcloud-distmaplassulus2013-11-051-1/+1
| | |
| | * Merge remote-tracking branch 'origin/master'lassulus2013-11-050-0/+0
| | |\ | | | | | | | | | | | | | | | | Conflicts: util/bin/make-realwallpaper
| | | * 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
| | |