aboutsummaryrefslogtreecommitdiffstats
path: root/conkeror
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2013-02-16 12:22:53 +0100
committerGravatar Tom Willemsen2013-02-16 12:22:53 +0100
commitbed46208533c2037e2c71100d504bac37371a472 (patch)
tree343521787796aea5726af1a9b022b651762d012f /conkeror
parent5d51c35bb73434f22363542230d2b01d397f223f (diff)
downloadmarkam-master.tar.gz
markam-master.zip
Update license informationHEADmaster
Diffstat (limited to 'conkeror')
-rw-r--r--conkeror/Makefile16
-rw-r--r--conkeror/markam.js16
2 files changed, 25 insertions, 7 deletions
diff --git a/conkeror/Makefile b/conkeror/Makefile
index 1d11b15..44be726 100644
--- a/conkeror/Makefile
+++ b/conkeror/Makefile
@@ -1,3 +1,19 @@
+# Copyright (C) 2012, 2013 Tom Willemsen
+#
+# This file is part of Markam
+#
+# Markam is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Markam is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Markam. If not, see <http://www.gnu.org/licenses/>.
DESTDIR ?= /usr/local
.PHONY: all install uninstall
diff --git a/conkeror/markam.js b/conkeror/markam.js
index 5e76702..ff30e98 100644
--- a/conkeror/markam.js
+++ b/conkeror/markam.js
@@ -1,18 +1,20 @@
/* markam -- Store/retrieve/manage bookmarks
Copyright (C) 2012,2013 Tom Willemsen <tom at ryuslash dot org>
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
+ This file is part of Markam
+
+ Markam is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ Markam is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with Markam. If not, see <http://www.gnu.org/licenses/>.
*/
/// Commentary: