167 Commits

Author SHA1 Message Date
Brett Bohnenkamper
1bbde000cc Whoops...should be working better now. v2.3.6 2011-06-13 22:18:24 -05:00
Brett Bohnenkamper
42b403370f Adding tentative PeppermintOS detection. 2011-06-13 22:06:56 -05:00
Brett Bohnenkamper
cff4d5c8ee Editing README slightly. 2011-06-06 17:30:45 -05:00
Brett Bohnenkamper
932d1c4abf A couple of attempted KDE/KWin fixes. 2011-06-03 10:33:23 -05:00
Brett Bohnenkamper
b5121f6207 Oops. My bad. Fixed /etc/os-release detection hopefully. 2011-06-03 09:42:16 -05:00
Brett Bohnenkamper
bbf1cf63ab Updating Frugalware detection with /etc/os-release. Will check other distros for this file. 2011-06-03 09:34:11 -05:00
Brett Bohnenkamper
6cbc234273 Updating version number. v2.3.5 2011-06-02 20:40:04 -05:00
Brett Bohnenkamper
d5949f7c51 Merge branch 'gh' 2011-06-02 20:37:54 -05:00
Brett Bohnenkamper
bdf0f1d46a Updating email in readme. 2011-06-02 20:31:34 -05:00
Brett Bohnenkamper
e268ef46b6 Updating TODO again. 2011-06-02 20:29:19 -05:00
Brett Bohnenkamper
f3a1e88075 Merge branch 'master' into github 2011-06-02 20:28:17 -05:00
Brett Bohnenkamper
86ab2cd2f8 Updating TODO again. 2011-06-02 20:25:22 -05:00
Brett Bohnenkamper
05d84d77df Adding tentative Frugalware detection. 2011-06-02 20:19:19 -05:00
Brett Bohnenkamper
4afc5ab0f3 Adding tentative Frugalware detection. 2011-06-02 20:18:55 -05:00
Brett Bohnenkamper
190d7897ce Updating TODO. FINALLY. 2011-05-28 23:08:52 -05:00
Brett Bohnenkamper
15616e8098 Updating versino number. 2011-05-28 23:03:54 -05:00
Brett Bohnenkamper
4906cfa993 Updating version number and finally updating the TODO. 2011-05-28 22:53:04 -05:00
Brett Bohnenkamper
2a682969a5 Adding github changes from atyoung and Kwpolska. 2011-05-28 18:57:39 -05:00
Brett Bohnenkamper
d6ba6190c7 Merge pull request #6 from atyoung/master
RE: Hotfix 003aa69a of my other hotfix  + Fixed / Added LXDE Support
2011-05-09 01:56:14 -07:00
Adam Young
dff35807e4 Merge branch 'master' of https://github.com/Kwpolska/screenFetch into Kwpolska-master
Conflicts:
	screenfetch-dev
2011-05-01 12:05:44 -07:00
Kwpolska
db3734d655 typo fix... yeah. 2011-05-01 12:37:21 +02:00
Kwpolska
3392dcda7b suse and version fix 2011-05-01 12:34:24 +02:00
Adam Young
f4e8bc4ee9 Merge pull request #3 from Kwpolska/master.
fixing spacing issues
2011-04-30 12:29:31 -07:00
Adam Young
e56a945a27 Took out dead matching code. Readability fix. 2011-04-30 12:21:11 -07:00
Adam Young
54a674f93e Better idea for matching. 2011-04-30 12:19:59 -07:00
Kwpolska
2f9156a13f spacing issues 2011-04-30 21:07:06 +02:00
Adam Young
464f4f904b Fixed a couple logo spacing issues. Added spaceing insensitivity to the -D flag. 2011-04-30 08:55:22 -07:00
Adam Young
10ee3cdc6c Case insensivity for the -D, a great idea from the Kwpolska fork. This implementation is truly case insensitive. 2011-04-29 19:29:05 -07:00
Adam Young
e431ffd912 Added / fixed LXDE support. 2011-04-28 03:56:47 -07:00
Brett Bohnenkamper
ff139ed27b Adding 256 color support. 2011-04-25 16:00:12 -05:00
Adam Young
003aa69a31 Brought over hotfix from f_wmfixes where logic fired wm twice. My fault entirely trying to fix the dependant detectwm call. 2011-04-24 21:19:06 -07:00
Adam Young
724f98c3ea Merge remote-tracking branch 'upstream/master' 2011-04-24 09:55:34 -07:00
Adam Young
bd6cbb7076 Revert "Brought back textcolor to the way it should be. I see the logic."
This reverts commit 5d6565aaa7.
2011-04-24 09:41:26 -07:00
Adam Young
5d6565aaa7 Brought back textcolor to the way it should be. I see the logic. 2011-04-24 09:37:35 -07:00
Brett Bohnenkamper
f7842f41e3 Adding atyoung's stuff and reverting textcolor variable change. 2011-04-24 11:27:02 -05:00
Adam Young
4cccb35c7a Brough in 6247505 as a hotfix. More of a bandaid really... 2011-04-23 10:57:35 -07:00
Adam Young
d0b9850bc8 Brought in bc1b285 from development branch, nothing experemental here just colors. 2011-04-23 10:22:26 -07:00
Brett Bohnenkamper
12f4f4c168 Editing version number. v2.3.4 2011-04-23 05:09:57 -05:00
Brett Bohnenkamper
9b262cbd7a Fixed an error causing stuff to not be detected. 2011-04-23 04:58:58 -05:00
Brett Bohnenkamper
2bbd40f919 Merge remote-tracking branch 'Kwpolska/master' 2011-04-23 04:37:22 -05:00
Brett Bohnenkamper
f9baeca4d5 Merge remote-tracking branch 'atyoung/master' 2011-04-23 04:36:04 -05:00
Adam Young
40426aa6da Added GPLv3 file as program is distributed under that, and having the license available is a requirement. 2011-04-22 15:45:53 -07:00
Adam Young
0487f7fa24 This I thought I had changed for the KDE fix but perhaps got reverted somewhere while I was having git problems. 2011-04-22 15:22:45 -07:00
Kwpolska
1feb889d6e Reverted the reversion. Tested by Kwpolska as working so this comes back. 2011-04-22 14:50:13 -07:00
Adam Young
f0e07a3b09 Revert "Reverted the reversion. It works fine."
This reverts commit fd7705f3d5.
2011-04-22 14:48:49 -07:00
Kwpolska
83735b453b Reverted the reversion. It works fine. 2011-04-22 14:45:46 -07:00
Adam Young
a8ac71db15 Revert "Reverted the reversion. It works fine."
This reverts commit fd7705f3d5.
2011-04-22 14:45:17 -07:00
Kwpolska
8e6a895d3a Reverted the reversion. It works fine. 2011-04-22 14:44:02 -07:00
Kwpolska
fd7705f3d5 Reverted the reversion. It works fine. 2011-04-22 05:26:15 -07:00
Adam Young
2797be451b Reverted 19d59df30f as did not have time to test this to make sure it works properly. 2011-04-21 21:15:19 -07:00