aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Barrucadu <mike@barrucadu.co.uk>2009-04-27 16:50:34 +0100
committerGravatar Barrucadu <mike@barrucadu.co.uk>2009-04-27 16:50:34 +0100
commitb7bfd454d19a611638440340d6c8efc3d21b9494 (patch)
treecb4b1b340b0192a313448f18eefa1e1e8f506b28
parent4a80918204bd7361b9b8c9fdbed986790fa0d12f (diff)
parent158043454ca86600bb96e94dd15325431edbf556 (diff)
Merge branch 'experimental' of git://github.com/axelson/uzbl into axelson/experimental
-rw-r--r--.gitignore4
-rw-r--r--Makefile1
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..73b2cfc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.*.swp
+tags
+*~
+uzbl
diff --git a/Makefile b/Makefile
index 4f4e6f0..de4fe4d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
CPPFLAGS=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0) -Wall -W
LDFLAGS=$(shell pkg-config --libs gtk+-2.0 webkit-1.0)
+.PHONY: all test clean install
all: uzbl
test: