diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-08 22:34:23 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-08 22:34:23 -0600 |
| commit | e3ceb1d3d814eb586fa7c899d0fcb54280f3d30b (patch) | |
| tree | b4a3c9139c6102f95412f611c3cd1d584de3a74f /odk/setsdkenv_unix | |
| parent | 3b2efb2043dd6871d5025b41936b6069a8dfda13 (diff) | |
| parent | 1ae1f64e641d67a553eac4bcc91566efbe6a5d48 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101':
sb138: #i116038# fresh implementation of binary URP bridge
dba34b: #i106807# use mysql instead of adabas now
sb126: #i112627# adapted SDK/DevGuide to configmgr re-write
Conflicts:
odk/util/makefile.pmk
Diffstat (limited to 'odk/setsdkenv_unix')
| -rw-r--r--[-rwxr-xr-x] | odk/setsdkenv_unix | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/odk/setsdkenv_unix b/odk/setsdkenv_unix index 6b0dd7c18683..6b0dd7c18683 100755..100644 --- a/odk/setsdkenv_unix +++ b/odk/setsdkenv_unix |