Changeset [9ab3bf0c351f80510fc2a085ee2a03f092c8b29c] by Dag Odenhall
Revision 9ab3bf0c351f80510fc2a085ee2a03f092c8b29c,
committed by Dag Odenhall
· May 1st, 2008 @ 07:22 PM
Merge branch 'master' into config
Conflicts:
lib/amazing/string.rb
38 changed files
-
R
COPYING -
R
web/views/license.rdoc -
M
LICENSE -
M
README.rdoc -
M
Rakefile -
M
amazing -
M
amazing.gemspec -
M
bin/amazing -
M
lib/amazing.rb -
M
lib/amazing/awesome.rb -
M
lib/amazing/cli.rb -
M
lib/amazing/options.rb -
M
lib/amazing/proc_file.rb -
M
lib/amazing/string.rb -
M
lib/amazing/widget.rb -
M
lib/amazing/widgets.rb -
M
lib/amazing/widgets/ac_adapter.rb -
M
lib/amazing/widgets/alsa.rb -
M
lib/amazing/widgets/battery.rb -
M
lib/amazing/widgets/clock.rb -
M
lib/amazing/widgets/cpu_info.rb -
M
lib/amazing/widgets/cpu_usage.rb -
M
lib/amazing/widgets/file.rb -
M
lib/amazing/widgets/file_system.rb -
M
lib/amazing/widgets/gmail.rb -
M
lib/amazing/widgets/maildir.rb -
M
lib/amazing/widgets/memory.rb -
M
lib/amazing/widgets/moc.rb -
M
lib/amazing/widgets/mpd.rb -
M
lib/amazing/widgets/net_traffic.rb -
M
lib/amazing/widgets/noop.rb -
M
lib/amazing/widgets/pacman.rb -
M
lib/amazing/widgets/raggle.rb -
M
lib/amazing/widgets/sup.rb -
M
lib/amazing/x11.rb -
M
lib/amazing/x11/display_name.rb -
M
web/Rakefile -
M
web/layouts/default.haml