summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Lange <k@dakko.us>2011-11-30 17:13:09 -0600
committerKevin Lange <k@dakko.us>2011-11-30 17:13:09 -0600
commite90cbac98cceed356645a510620f85bd87c6b463 (patch)
treef20bbb574bd84678d70bdfc18643e5a2bde6510a
parentf78de8320de533094e20e32e9f3f408905956e34 (diff)
parent925e412be5ef5c7046a730a3488528e5faeb441d (diff)
downloadnyancat-e90cbac98cceed356645a510620f85bd87c6b463.tar.gz
Merge branch 'master' of github.com:klange/nyancat
-rw-r--r--nyancat.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nyancat.c b/nyancat.c
index 25db66c..6b0ad19 100644
--- a/nyancat.c
+++ b/nyancat.c
@@ -831,9 +831,9 @@ int main(int argc, char ** argv) {
try_again:
printf("Select a mode:\n");
printf(" 1 xterm 256-color compatible mode (best)\n");
- printf(" 2 xterm standard-color mode (okay)\n");
- printf(" 3 linux + blink (may not work)\n");
- printf(" 4 linux fallback (for framebuffers)\n");
+ printf(" 2 xterm standard-color mode (good)\n");
+ printf(" 3 linux + blink attribute (okay)\n");
+ printf(" 4 standard ansi terminal (ugly)\n");
printf("Your selection: ");
char response[10];
fgets(response, 2, stdin);
awei e220 at commands' by Jarmichael1-12/+9 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1115 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-15drv_picoLCDGraphic.c: minimum USB read timeout is now 1 msmzuther1-1/+1 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1114 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-14drv_picoLCDGraphic.c: added configuration for USB read timeoutmzuther1-1/+9 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1113 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-14indent.sh runmichael1-172/+171 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1112 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-14plugin_huawei-fix-interval-check_V2.patch from Jarmichael1-35/+35 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1111 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-12Improved config behavior.mjona1-9/+32 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1110 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-12Fixed a segmentation fault bug in cfg_get().mjona1-1/+1 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1109 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-11All static memory allocations were turned into dynamical ones.mjona1-128/+200 Improved configuration parameters: - FifoPath to specify the fifo path (if absent, a built in replacement is used) - FifoBufSize to specify the size of the internal buffer (this parameter is optional as the plugin will try to match the number of display columns; if it fails and no FifoBufSize parameter is supplied then a built in replacement is used) Simplified and rationalized init and exit functions: most global variables have been localized. Fixed several off-by-one overflows memory bugs. git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1108 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-07timer.c: two small optimizations (removed "flag"; tv_usec can't be negative)mzuther1-7/+4 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1107 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-07added grouping of widgets by update interval (new file "timer_group.c")mzuther13-168/+441 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1106 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-07BUG: handle negative delays in timer_process() (timer.c)mzuther1-0/+4 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1105 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-06timer.c: I had forgotten how to initialize a "struct" :)mzuther1-3/+4 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1104 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-06BUG: compensate timers for processing delay ("timer.c")mzuther1-1/+3 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1103 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-06timer.c: exchanged "proprietary code" with timeradd() and timersub() functionsmzuther1-14/+10 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1102 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-04timer.c: removed fruitless changes to variable "flag" from timer_process()mzuther1-2/+0 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1101 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-04According to its man page, timercmp() is broken on some systems -- applied ↵mzuther1-1/+1 the recommended (and equivalent) change. git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1100 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-04small warning removedmichael1-1/+1 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1099 3ae390bd-cb1e-0410-b409-cd5a39f66f1f 2010-02-04clear errno after creating the FIFO by Claas Hilbrechtmichael1-0/+2 git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1098 3ae390bd-cb1e-0410-b409-cd5a39f66f1f