projects / bind9-cn.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0434379 c2f4105)
Merge branch 'master' of merak.carnet.hr:/srv/paketi/carnet-debian/scm/bind9-cn into... etch lenny
authorDinko Korunic <kreator@carnet.hr>
Sat, 9 May 2009 11:11:55 +0000 (13:11 +0200)
committerDinko Korunic <kreator@carnet.hr>
Sat, 9 May 2009 11:11:55 +0000 (13:11 +0200)
- resolve master/etch conflikte..
Conflicts:

debian/changelog
debian/control

1  2 
debian/control patch | diff1 | diff2 | blob | history

diff --cc debian/control
Simple merge
bind9-cn