diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-28 08:11:05 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-28 08:11:05 +1000 |
| commit | 51ae2302a68033b1b79a4ebc8d4cbab64adcf843 (patch) | |
| tree | d8b1af54efe4ec70607ef2bcbd873c2cd667d894 /swat | |
| parent | 5d0d239d1ab826c91839a603f93d2c0061658888 (diff) | |
| parent | 52b230141b5ad9f317f97e7d257703614bab3985 (diff) | |
| download | samba-51ae2302a68033b1b79a4ebc8d4cbab64adcf843.tar.gz samba-51ae2302a68033b1b79a4ebc8d4cbab64adcf843.tar.bz2 samba-51ae2302a68033b1b79a4ebc8d4cbab64adcf843.zip | |
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)
Diffstat (limited to 'swat')
0 files changed, 0 insertions, 0 deletions