- Committer: Steve Langasek
- Date: 2010-09-10 11:49:34 UTC
- Revision ID: steve.langasek@canonical.com-20100910114934-wqwsrkabvu9gnqah
Fix a typo in debian/smb.conf introduced in a previous merge that causes
3-way-merge to fail gratuitously for anyone who has enabled the [homes]
share.
3-way-merge to fail gratuitously for anyone who has enabled the [homes]
share.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
.pc
|
111 | 13 years ago | Steve Langasek | merge version 2:3.5.4~dfsg-1 |
|
||
|
client
|
111 | 13 years ago | Steve Langasek | merge version 2:3.5.4~dfsg-1 |
|
||
|
codepages
|
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
debian
|
57 | 15 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
docs
|
4 | 18 years ago | Bazaar Package Importer | Resynchronise with Debian, resolving merge conflic |
|
||
|
docs-xml
|
42 | 15 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
examples
|
4 | 18 years ago | Bazaar Package Importer | Resynchronise with Debian, resolving merge conflic |
|
||
|
lib
|
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
libcli
|
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
libds
|
111 | 13 years ago | Steve Langasek | merge version 2:3.5.4~dfsg-1 |
|
||
|
libgpo
|
111 | 13 years ago | Steve Langasek | merge version 2:3.5.4~dfsg-1 |
|
||
|
librpc
|
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
m4
|
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
nsswitch
|
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
packaging
|
4 | 18 years ago | Bazaar Package Importer | Resynchronise with Debian, resolving merge conflic |
|
||
|
packaging4
|
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
pcp
|
4 | 18 years ago | Bazaar Package Importer | Resynchronise with Debian, resolving merge conflic |
|
||
|
pidl
|
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
release-scripts
|
42 | 15 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
script
|
111 | 13 years ago | Steve Langasek | merge version 2:3.5.4~dfsg-1 |
|
||
|
selftest
|
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
source3
|
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
source4
|
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
swat
|
4 | 18 years ago | Bazaar Package Importer | Resynchronise with Debian, resolving merge conflic |
|
||
|
swat2
|
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
testdata
|
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
testprogs
|
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
tests
|
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: |
|
||
|
testsuite
|
4 | 18 years ago | Bazaar Package Importer | Resynchronise with Debian, resolving merge conflic |
|
||
.gitignore |
111 | 13 years ago | Steve Langasek | merge version 2:3.5.4~dfsg-1 | 11.3 KB |
|
|
|
COPYING |
45 | 15 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: | 34.3 KB |
|
|
|
howto-ol-backend-s4.txt |
111 | 13 years ago | Steve Langasek | merge version 2:3.5.4~dfsg-1 | 3.4 KB |
|
|
|
howto4.txt |
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: | 5.2 KB |
|
|
|
MAINTAINERS |
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: | 1.1 KB |
|
|
|
Manifest |
31 | 16 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: | 2.4 KB |
|
|
|
merged-branches.txt |
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: | 262 bytes |
|
|
|
PFIF.txt |
45 | 15 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: | 188 bytes |
|
|
|
prog_guide4.txt |
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: | 30.2 KB |
|
|
|
Read-Manifest-Now |
4 | 18 years ago | Bazaar Package Importer | Resynchronise with Debian, resolving merge conflic | Empty |
|
|
|
README |
111 | 13 years ago | Steve Langasek | merge version 2:3.5.4~dfsg-1 | 8.4 KB |
|
|
|
README.Coding |
111 | 13 years ago | Steve Langasek | merge version 2:3.5.4~dfsg-1 | 6.3 KB |
|
|
|
Roadmap |
111 | 13 years ago | Steve Langasek | merge version 2:3.5.4~dfsg-1 | 1 KB |
|
|
|
swat2.txt |
77 | 14 years ago | Bazaar Package Importer | * Merge from debian unstable, remaining changes: | 2.4 KB |
|
|
|
WHATSNEW.txt |
111 | 13 years ago | Steve Langasek | merge version 2:3.5.4~dfsg-1 | 27.1 KB |
|
|
|
WHATSNEW4.txt |
111 | 13 years ago | Steve Langasek | merge version 2:3.5.4~dfsg-1 | 4.5 KB |
|
|