[dss-commits] digitalSTROM Server branch, master, updated. 8d365b1238d9791e7068104ab57a84246bf6227d
git version control
dss-commits at forum.digitalstrom.org
Mon Jan 4 15:00:15 CET 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "digitalSTROM Server".
The branch, master has been updated
via 8d365b1238d9791e7068104ab57a84246bf6227d (commit)
via 90f2e4717982da4a488992f582fe4f109b50f2ae (commit)
via 140c45c3d1b7c771a6a3c634c90291e959660638 (commit)
via f78f889bbc6bd9824a5668dc5869ee8c87114c96 (commit)
from 9677344c0190a1dee41f916959efc2190ba1dcd3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8d365b1238d9791e7068104ab57a84246bf6227d
Merge: 90f2e4717982da4a488992f582fe4f109b50f2ae 9677344c0190a1dee41f916959efc2190ba1dcd3
Author: Patrick Stählin <pstaehlin at futurelab.ch>
Date: Mon Jan 4 14:58:21 2010 +0100
Merge branch 'master' of ssh://developer.digitalstrom.org/home/git/sources/dss
commit 90f2e4717982da4a488992f582fe4f109b50f2ae
Author: Patrick Stählin <pstaehlin at futurelab.ch>
Date: Mon Jan 4 13:57:06 2010 +0100
Updated licence information in the header
commit 140c45c3d1b7c771a6a3c634c90291e959660638
Author: Patrick Stählin <pstaehlin at futurelab.ch>
Date: Mon Jan 4 13:51:15 2010 +0100
Compiles again
commit f78f889bbc6bd9824a5668dc5869ee8c87114c96
Author: Patrick Stählin <pstaehlin at futurelab.ch>
Date: Mon Jan 4 13:50:16 2010 +0100
Added newline to the end of the file
Removes another warning
-----------------------------------------------------------------------
Changes:
diff --git a/.cproject b/.cproject
index 12b784a..8458ebf 100644
--- a/.cproject
+++ b/.cproject
@@ -28,6 +28,7 @@
<option id="gnu.cpp.compiler.option.preprocessor.preprocess.1231112907" name="Preprocess only (-E)" superClass="gnu.cpp.compiler.option.preprocessor.preprocess"/>
<option id="gnu.cpp.compiler.option.preprocessor.def.701665023" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
<listOptionValue builtIn="false" value="XP_UNIX"/>
+<listOptionValue builtIn="false" value="HAVE_MOZJS_JSAPI_H"/>
<listOptionValue builtIn="false" value="HAVE_STDINT"/>
<listOptionValue builtIn="false" value="HAVE_LIBICAL_ICAL_H"/>
<listOptionValue builtIn="false" value="USE_DNS_SD"/>
diff --git a/core/busrequestdispatcher.cpp b/core/busrequestdispatcher.cpp
index 1eebd51..81fbc42 100644
--- a/core/busrequestdispatcher.cpp
+++ b/core/busrequestdispatcher.cpp
@@ -1,19 +1,21 @@
/*
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+ Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
+ Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
- This program is free software: you can redistribute it and/or modify
+ This file is part of digitalSTROM Server.
+
+ digitalSTROM Server is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ digitalSTROM Server is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/core/busrequestdispatcher.h b/core/busrequestdispatcher.h
index 081f7c5..f410722 100644
--- a/core/busrequestdispatcher.h
+++ b/core/busrequestdispatcher.h
@@ -1,19 +1,21 @@
/*
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+ Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
+ Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
- This program is free software: you can redistribute it and/or modify
+ This file is part of digitalSTROM Server.
+
+ digitalSTROM Server is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ digitalSTROM Server is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/core/ds485/ds485busrequestdispatcher.cpp b/core/ds485/ds485busrequestdispatcher.cpp
index a2d78e1..63a9ca6 100644
--- a/core/ds485/ds485busrequestdispatcher.cpp
+++ b/core/ds485/ds485busrequestdispatcher.cpp
@@ -1,19 +1,21 @@
/*
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+ Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
+ Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
- This program is free software: you can redistribute it and/or modify
+ This file is part of digitalSTROM Server.
+
+ digitalSTROM Server is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ digitalSTROM Server is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/core/ds485/ds485busrequestdispatcher.h b/core/ds485/ds485busrequestdispatcher.h
index a049c45..d9045bd 100644
--- a/core/ds485/ds485busrequestdispatcher.h
+++ b/core/ds485/ds485busrequestdispatcher.h
@@ -1,19 +1,21 @@
/*
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+ Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
+ Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
- This program is free software: you can redistribute it and/or modify
+ This file is part of digitalSTROM Server.
+
+ digitalSTROM Server is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ digitalSTROM Server is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/core/model/deviceinterface.cpp b/core/model/deviceinterface.cpp
index f677f67..6b8e096 100644
--- a/core/model/deviceinterface.cpp
+++ b/core/model/deviceinterface.cpp
@@ -1,19 +1,21 @@
/*
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+ Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
+ Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
- This program is free software: you can redistribute it and/or modify
+ This file is part of digitalSTROM Server.
+
+ digitalSTROM Server is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ digitalSTROM Server is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -32,4 +34,4 @@ namespace dss {
callScene(SceneMin);
}
-}
\ No newline at end of file
+}
diff --git a/core/web/webrequests.cpp b/core/web/webrequests.cpp
index 496b6f2..35103b9 100644
--- a/core/web/webrequests.cpp
+++ b/core/web/webrequests.cpp
@@ -1,19 +1,21 @@
/*
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+ Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
+ Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
- This program is free software: you can redistribute it and/or modify
+ This file is part of digitalSTROM Server.
+
+ digitalSTROM Server is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ digitalSTROM Server is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/core/web/webrequests.h b/core/web/webrequests.h
index 21ded0d..ceb1789 100644
--- a/core/web/webrequests.h
+++ b/core/web/webrequests.h
@@ -1,19 +1,21 @@
/*
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+ Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
+ Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
- This program is free software: you can redistribute it and/or modify
+ This file is part of digitalSTROM Server.
+
+ digitalSTROM Server is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ digitalSTROM Server is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
*/
hooks/post-receive
--
digitalSTROM Server
More information about the dss-commits
mailing list