| commit | 44f9b6e3c8592570ba7625decef1f4512d95e8f7 | |
| author | Petr Písař <petr.pisar@atlas.cz> | |
| Sun, 27 Jun 2010 19:15:30 +0000 (27 21:15 +0200) | ||
| committer | Petr Písař <petr.pisar@atlas.cz> | |
| Sun, 27 Jun 2010 19:15:30 +0000 (27 21:15 +0200) | ||
| tree | e4eb23c9ee099dbf43ffc6a7ad731f8952ec89eb | treesnapshot (tar.gz zip) |
| parent | dcf7812a5bcf998a8d42609af3adbb6af5836e49 | commitdiff |
| parent | da338414c5f957fcc73daa21271a0856efda8a1e | commitdiff |
Merge branch 'master' into xmldoc
Conflicts:
src/isds.c
Unified base64 encoding clashed in document insertation
Conflicts:
src/isds.c
Unified base64 encoding clashed in document insertation
| client/Makefile.am | diff1 | diff2 | blobhistory |
| src/isds.c | diff1 | diff2 | blobhistory |
| src/isds.h | diff1 | diff2 | blobhistory |