projects
/
monky
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfix: mixerbar showed wrong values
[monky]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
a5de94b
..
01ddd7e
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,3
+1,5
@@
+# -*- mode: Makefile; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+#
# Conky, a system monitor, based on torsmo
#
# Any original torsmo code is licensed under the BSD license
# Conky, a system monitor, based on torsmo
#
# Any original torsmo code is licensed under the BSD license
@@
-7,7
+9,7
@@
# Please see COPYING for details
#
# Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
# Please see COPYING for details
#
# Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
-# Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+# Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
# All rights reserved.
#
# This program is free software: you can redistribute it and/or modify
# All rights reserved.
#
# This program is free software: you can redistribute it and/or modify
@@
-26,6
+28,7
@@
SUBDIRS = \
src \
doc \
SUBDIRS = \
src \
doc \
+ lua \
data
AUTOMAKE_OPTIONS = \
data
AUTOMAKE_OPTIONS = \
@@
-68,4
+71,4
@@
doxy: Doxyfile
.PHONY: distclean-local doxy
.PHONY: distclean-local doxy
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+# vi:set ts=4 sw=4 noet ai nocindent syntax=automake: