git.samba.org / kai / samba.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5d0d239 52b2301)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 27 May 2008 22:11:05 +0000 (08:11 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 27 May 2008 22:11:05 +0000 (08:11 +1000)
commit51ae2302a68033b1b79a4ebc8d4cbab64adcf843
treed8b1af54efe4ec70607ef2bcbd873c2cd667d894tree
parent5d0d239d1ab826c91839a603f93d2c0061658888commit | diff
parent52b230141b5ad9f317f97e7d257703614bab3985commit | diff
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet

It seems the format of main.mk changed in my sleep...

Conflicts:

source/main.mk
(This used to be commit 56f2288e4f4f1aa70d11fc5f118458baf5803627)
source4/librpc/config.mk diff1 | diff2 | blob | history
source4/main.mk diff1 | diff2 | blob | history
Kai's WIP code