Commit graph

1416 commits

Author SHA1 Message Date
Dylan
1fb3c59bc6 Add note about ConEmu to the Readme 2016-03-27 13:34:29 +11:00
Dylan Araps
65b7c2fc50 Merge pull request #184 from dylanaraps/cleanup
Info function cleanup
2016-03-27 12:22:59 +11:00
Dylan
2656aa5563 Battery remove 'None' value 2016-03-27 12:22:01 +11:00
Dylan
c27e70864d Changelog 2016-03-27 12:20:34 +11:00
Dylan
aa86f8ada2 Revert all whitespace fixes for OSX 2016-03-27 12:15:40 +11:00
Dylan
16f47e2f4e I hate whitespace right now 2016-03-27 12:12:25 +11:00
Dylan
9acf6d9554 Fixed whitespace issue for realsies this time 2016-03-27 12:09:52 +11:00
Dylan
d80d7e8c17 Added echo to debug 2016-03-27 12:06:33 +11:00
Dylan
13f439502b Revert whitespace fix for OSx 2016-03-27 12:03:40 +11:00
Dylan
eacce05f3a Fixed broken CPU speed on linux when /sys/ wasn't available 2016-03-27 11:59:01 +11:00
Dylan
0c5869da38 Fix weird whitespace issues with cores 2016-03-27 11:52:24 +11:00
Dylan
f847d9ee22 Fix whitespace in OS X xeon cpu 2016-03-27 11:15:12 +11:00
Dylan
d537b35695 Fix whitespace in OS X xeon cpu 2016-03-27 11:11:41 +11:00
Dylan
e5f7c40100 Merge branch 'master' of github.com:dylanaraps/neofetch 2016-03-27 11:02:18 +11:00
Dylan
c2a23a56a9 Changelog 2016-03-27 11:02:13 +11:00
Dylan Araps
a50a8fb573 Merge pull request #186 from firstEncounter/master
Correct NVIDIA capitalization
2016-03-27 11:01:15 +11:00
Luke Street
6741dd3d4e Correct NVIDIA capitalization 2016-03-26 19:39:55 -04:00
Dylan
b154783074 Changelog 2016-03-27 09:33:01 +11:00
Dylan Araps
e555ceeb9f Merge pull request #185 from onespaceman/master
Use $GTK2_RC_FILES for GTK2 config if set
2016-03-27 09:31:38 +11:00
onespaceman
4b8e2c5e1b Use $GTK2_RC_FILES for GTK2 config if set 2016-03-26 15:04:59 -04:00
Dylan
912295d821 Remove all 'Unknown' printing when a command fails, instead we display nothing 2016-03-26 23:36:37 +11:00
Dylan
b4f19e8a3d Cleanup CPU function 2016-03-26 23:17:27 +11:00
Dylan
95c744f0f8 Merge Windows and Linux uptime blocks since they're the same 2016-03-26 22:46:07 +11:00
Dylan
58e833cd10 Merge branch 'master' of github.com:dylanaraps/neofetch 2016-03-26 22:37:25 +11:00
Dylan
cee91eac31 Changelog 2016-03-26 22:33:22 +11:00
Dylan
3584ebcf76 Fix issues with Puppy Linux 2016-03-26 22:32:31 +11:00
Dylan Araps
9b5cf28793 Merge pull request #175 from dylanaraps/memory_legacy
Rewrite memory function to work on older linux kernel versions.
2016-03-26 22:31:25 +11:00
Dylan
8311d3f2e3 Cleanup distro detection 2016-03-26 22:13:03 +11:00
Dylan
7c62ff2d26 Fix incorrect colors in travis ascii art 2016-03-26 19:16:03 +11:00
Dylan
967e8eca8b More travis output improvements 2016-03-26 19:14:27 +11:00
Dylan
ed469eee06 Travis output improvementS 2016-03-26 19:12:33 +11:00
Dylan
2dcf3247ee Merge branch 'master' of github.com:dylanaraps/neofetch 2016-03-26 19:03:23 +11:00
Dylan
98ed313f79 Remove whitespace from travis logo 2016-03-26 18:55:21 +11:00
Dylan Araps
4a0e8cfc4e Merge pull request #183 from dawidd6/patch-1
added License badge to README
2016-03-26 18:53:45 +11:00
Dawid
ee7e9c746d added License badge to README 2016-03-26 08:30:48 +01:00
Dylan
edd3e2abaf Small change to travis ascii 2016-03-26 15:30:39 +11:00
Dylan
54652b36f9 Turns out that travis doesn't highlight over newlines 2016-03-26 15:27:54 +11:00
Dylan
fb0820c15c Changelog 2016-03-26 15:23:03 +11:00
Dylan
e10e666e27 Travis use custom ascii art 2016-03-26 15:22:48 +11:00
Dylan
424d6e6c0b Added Travis CI ascii art 2016-03-26 15:22:24 +11:00
Dylan
bdfeb7c3a3 Travis, fix a hang on OSX 2016-03-26 14:52:30 +11:00
Dylan
c3087251e7 Revert make prefix 2016-03-26 14:47:19 +11:00
Dylan
5870546e3b Travis use prefix on OSX 2016-03-26 14:45:24 +11:00
Dylan
bf44887c9c Remove bash prefix from travis 2016-03-26 14:39:47 +11:00
Dylan
f5212bd2bf Add an OSX test to travis 2016-03-26 14:32:06 +11:00
Dylan
5a4a4cb147 Travis don't use color blocks 2016-03-26 14:24:13 +11:00
Dylan
c015b7eda5 Changelog 2016-03-26 14:22:44 +11:00
Dylan
1442216ded Fix '+' sign in date output 2016-03-26 14:22:10 +11:00
Dylan
f2253afbfa Fix travis overlap 2016-03-26 14:20:28 +11:00
Dylan
98313547e9 Merge branch 'master' of github.com:dylanaraps/neofetch 2016-03-26 14:17:24 +11:00