diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-08 03:45:06 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-08 03:45:06 +0200 |
| commit | b5d84a74d146cfe0d2e0c336a88bd269ad61cded (patch) | |
| tree | 8acad6b634cfe312144f92f8a0fb6ab44b47cd19 /swat | |
| parent | 237f1cca028881a57f961884f427673907c1535a (diff) | |
| parent | 1f474f4a545752f7ac0ad402d01d1e768b973dbe (diff) | |
| download | samba-b5d84a74d146cfe0d2e0c336a88bd269ad61cded.tar.gz samba-b5d84a74d146cfe0d2e0c336a88bd269ad61cded.tar.bz2 samba-b5d84a74d146cfe0d2e0c336a88bd269ad61cded.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/auth/credentials/config.mk
source/auth/gensec/config.mk
source/build/smb_build/makefile.pm
source/heimdal_build/config.mk
source/lib/events/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/registry/config.mk
source/lib/socket_wrapper/config.mk
source/lib/tdb/config.mk
source/lib/tls/config.mk
source/lib/util/config.mk
source/libcli/config.mk
source/libcli/ldap/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/scripting/ejs/config.mk
source/smbd/process_model.mk
(This used to be commit 760378e0294dd0cd4523a83448328478632d7e3d)
Diffstat (limited to 'swat')
| -rw-r--r-- | swat/scripting/client/call.js | 2 | ||||
| -rw-r--r-- | swat/scripting/client/desktop.js | 2 | ||||
| -rw-r--r-- | swat/scripting/client/encoder.js | 2 | ||||
| -rw-r--r-- | swat/scripting/client/js_scripts.js | 2 | ||||
| -rw-r--r-- | swat/scripting/client/regedit.js | 2 | ||||
| -rw-r--r-- | swat/scripting/client/status.js | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/swat/scripting/client/call.js b/swat/scripting/client/call.js index 2886471db2..316dec5bb1 100644 --- a/swat/scripting/client/call.js +++ b/swat/scripting/client/call.js @@ -2,7 +2,7 @@ client side js functions for remote calls into the server Copyright Andrew Tridgell 2005 - released under the GNU GPL Version 2 or later + released under the GNU GPL Version 3 or later */ var __call = new Object(); diff --git a/swat/scripting/client/desktop.js b/swat/scripting/client/desktop.js index 9e1a342936..8e55cc94ee 100644 --- a/swat/scripting/client/desktop.js +++ b/swat/scripting/client/desktop.js @@ -2,7 +2,7 @@ Windows, tabs, and general widgetry for SWAT. Copyright (C) Deryck Hodge 2005 - released under the GNU GPL Version 2 or later + released under the GNU GPL Version 3 or later */ /* Qooxdoo's browser sniffer doesn't distinguish IE version. diff --git a/swat/scripting/client/encoder.js b/swat/scripting/client/encoder.js index 4aa4cc0954..2a4d174b0e 100644 --- a/swat/scripting/client/encoder.js +++ b/swat/scripting/client/encoder.js @@ -2,7 +2,7 @@ client side js functions for encoding/decoding objects into linear strings Copyright Andrew Tridgell 2005 - released under the GNU GPL Version 2 or later + released under the GNU GPL Version 3 or later */ /* usage: diff --git a/swat/scripting/client/js_scripts.js b/swat/scripting/client/js_scripts.js index 1c6e5806f4..ea87df02c8 100644 --- a/swat/scripting/client/js_scripts.js +++ b/swat/scripting/client/js_scripts.js @@ -2,7 +2,7 @@ Beginnnigs of a script manager for SWAT. Copyright (C) Deryck Hodge 2005 - released under the GNU GPL Version 2 or later + released under the GNU GPL Version 3 or later */ var head = document.getElementsByTagName('head')[0]; diff --git a/swat/scripting/client/regedit.js b/swat/scripting/client/regedit.js index 9175017c2e..555ba9fb90 100644 --- a/swat/scripting/client/regedit.js +++ b/swat/scripting/client/regedit.js @@ -2,7 +2,7 @@ client side js functions for registry editing Copyright Andrew Tridgell 2005 - released under the GNU GPL Version 2 or later + released under the GNU GPL Version 3 or later */ diff --git a/swat/scripting/client/status.js b/swat/scripting/client/status.js index 31ee31c43b..a41038d5e9 100644 --- a/swat/scripting/client/status.js +++ b/swat/scripting/client/status.js @@ -1,7 +1,7 @@ /* server status library for SWAT - released under the GNU GPL Version 2 or later + released under the GNU GPL Version 3 or later */ |