projects
/
yazpp-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
29388f5
)
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp
author
Adam Dickmeiss
<adam@indexdata.dk>
Fri, 29 Apr 2011 11:26:48 +0000
(11:26 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Fri, 29 Apr 2011 11:26:48 +0000
(11:26 +0000)
Conflicts:
IDMETA
IDMETA
patch
|
blob
|
history
m4
patch
|
blob
|
history
diff --git
a/IDMETA
b/IDMETA
index
423a6de
..
86664dc
100644
(file)
--- a/
IDMETA
+++ b/
IDMETA
@@
-1,2
+1,2
@@
-DEBIAN_DIST="squeeze lenny"
-UBUNTU_DIST="maverick lucid karmic"
+DEBIAN_DIST="wheezy squeeze lenny"
+UBUNTU_DIST="natty maverick lucid karmic"
diff --git
a/m4
b/m4
index
f7d7eb4
..
1fa0b45
160000
(submodule)
--- a/
m4
+++ b/
m4
@@
-1
+1
@@
-Subproject commit f7d7eb4b44b7fdad1942e32856d6afc2e6dcabda
+Subproject commit 1fa0b45a8141955801938f967f1d1dca1b042c17