author | Florian Pose <fp@igh-essen.com> |
Tue, 13 Feb 2007 14:18:29 +0000 | |
branch | stable-1.2 |
changeset 1742 | 9195107c9441 |
parent 1732 | 1cc865ba17c2 |
child 1744 | 7bc131b92039 |
permissions | -rw-r--r-- |
1715
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
1 |
/****************************************************************************** |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
2 |
* |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
3 |
* $Id$ |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
4 |
* |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
5 |
* Copyright (C) 2006 Florian Pose, Ingenieurgemeinschaft IgH |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
6 |
* |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
7 |
* This file is part of the IgH EtherCAT Master. |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
8 |
* |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
9 |
* The IgH EtherCAT Master is free software; you can redistribute it |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
10 |
* and/or modify it under the terms of the GNU General Public License |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
11 |
* as published by the Free Software Foundation; either version 2 of the |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
12 |
* License, or (at your option) any later version. |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
13 |
* |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
14 |
* The IgH EtherCAT Master is distributed in the hope that it will be |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
15 |
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
16 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
17 |
* GNU General Public License for more details. |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
18 |
* |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
19 |
* You should have received a copy of the GNU General Public License |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
20 |
* along with the IgH EtherCAT Master; if not, write to the Free Software |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
21 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
22 |
* |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
23 |
* The right to use EtherCAT Technology is granted and comes free of |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
24 |
* charge under condition of compatibility of product made by |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
25 |
* Licensee. People intending to distribute/sell products based on the |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
26 |
* code, have to sign an agreement to guarantee that products using |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
27 |
* software based on IgH EtherCAT master stay compatible with the actual |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
28 |
* EtherCAT specification (which are released themselves as an open |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
29 |
* standard) as the (only) precondition to have the right to use EtherCAT |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
30 |
* Technology, IP and trade marks. |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
31 |
* |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
32 |
*****************************************************************************/ |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
33 |
|
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
34 |
/** |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
35 |
\file |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
36 |
EtherCAT Slave Database. |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
37 |
*/ |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
38 |
|
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
39 |
/*****************************************************************************/ |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
40 |
|
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
41 |
#ifndef __ECDB_H__ |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
42 |
#define __ECDB_H__ |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
43 |
|
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
44 |
/*****************************************************************************/ |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
45 |
|
1717
cc1ee18207d3
MERGE trunk -r513:515 -> branches/stable-1.1 (Missing code docs)
Florian Pose <fp@igh-essen.com>
parents:
1716
diff
changeset
|
46 |
/** \cond */ |
cc1ee18207d3
MERGE trunk -r513:515 -> branches/stable-1.1 (Missing code docs)
Florian Pose <fp@igh-essen.com>
parents:
1716
diff
changeset
|
47 |
|
1732
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
48 |
#define Beckhoff_BK1120 0x00000002, 0x04602C22 |
1cc865ba17c2
MERGE trunk -r588:681 -> branches/stable-1.1 (Bugfixes, Ack behaviour, CoE via Sysfs, PDO ranges, 2.6.17 support, improved autotools, documentation)
Florian Pose <fp@igh-essen.com>
parents:
1731
diff
changeset
|
49 |
|
1719
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
50 |
#define Beckhoff_EL1004_Inputs 0x00000002, 0x03EC3052, 0x3101, 1 |
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
51 |
|
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
52 |
#define Beckhoff_EL1014_Inputs 0x00000002, 0x03F63052, 0x3101, 1 |
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
53 |
|
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
54 |
#define Beckhoff_EL2004_Outputs 0x00000002, 0x07D43052, 0x3001, 1 |
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
55 |
|
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
56 |
#define Beckhoff_EL2032_Outputs 0x00000002, 0x07F03052, 0x3001, 1 |
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
57 |
|
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
58 |
#define Beckhoff_EL3102_Status1 0x00000002, 0x0C1E3052, 0x3101, 1 |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
59 |
#define Beckhoff_EL3102_Input1 0x00000002, 0x0C1E3052, 0x3101, 2 |
1719
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
60 |
#define Beckhoff_EL3102_Status2 0x00000002, 0x0C1E3052, 0x3102, 1 |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
61 |
#define Beckhoff_EL3102_Input2 0x00000002, 0x0C1E3052, 0x3102, 2 |
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
62 |
|
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
63 |
#define Beckhoff_EL3152_Status1 0x00000002, 0x0C503052, 0x3101, 1 |
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
64 |
#define Beckhoff_EL3152_Input1 0x00000002, 0x0C503052, 0x3101, 2 |
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
65 |
#define Beckhoff_EL3152_Status2 0x00000002, 0x0C503052, 0x3102, 1 |
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
66 |
#define Beckhoff_EL3152_Input2 0x00000002, 0x0C503052, 0x3102, 2 |
1719
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
67 |
|
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
68 |
#define Beckhoff_EL3162_Status1 0x00000002, 0x0C5A3052, 0x3101, 1 |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
69 |
#define Beckhoff_EL3162_Input1 0x00000002, 0x0C5A3052, 0x3101, 2 |
1719
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
70 |
#define Beckhoff_EL3162_Status2 0x00000002, 0x0C5A3052, 0x3102, 1 |
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
71 |
#define Beckhoff_EL3162_Input2 0x00000002, 0x0C5A3052, 0x3102, 2 |
1719
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
72 |
|
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
73 |
#define Beckhoff_EL4102_Output1 0x00000002, 0x10063052, 0x6411, 1 |
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
74 |
#define Beckhoff_EL4102_Output2 0x00000002, 0x10063052, 0x6411, 2 |
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
75 |
|
1715
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
76 |
#define Beckhoff_EL4132_Output1 0x00000002, 0x10243052, 0x6411, 1 |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
77 |
#define Beckhoff_EL4132_Output2 0x00000002, 0x10243052, 0x6411, 2 |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
78 |
|
1716
9440f4ff25c7
MERGE trunk -r494:513 -> branches/stable-1.1 (SDO configuration, bugfixes, EoE frame rates)
Florian Pose <fp@igh-essen.com>
parents:
1715
diff
changeset
|
79 |
#define Beckhoff_EL5001_Status 0x00000002, 0x13893052, 0x3101, 1 |
9440f4ff25c7
MERGE trunk -r494:513 -> branches/stable-1.1 (SDO configuration, bugfixes, EoE frame rates)
Florian Pose <fp@igh-essen.com>
parents:
1715
diff
changeset
|
80 |
#define Beckhoff_EL5001_Value 0x00000002, 0x13893052, 0x3101, 2 |
9440f4ff25c7
MERGE trunk -r494:513 -> branches/stable-1.1 (SDO configuration, bugfixes, EoE frame rates)
Florian Pose <fp@igh-essen.com>
parents:
1715
diff
changeset
|
81 |
|
1731
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
82 |
#define Beckhoff_EL5101_Status 0x00000002, 0x13ED3052, 0x6000, 1 |
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
83 |
#define Beckhoff_EL5101_Value 0x00000002, 0x13ED3052, 0x6000, 2 |
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
84 |
#define Beckhoff_EL5101_Latch 0x00000002, 0x13ED3052, 0x6000, 3 |
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
85 |
#define Beckhoff_EL5101_Frequency 0x00000002, 0x13ED3052, 0x6000, 4 |
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
86 |
#define Beckhoff_EL5101_Period 0x00000002, 0x13ED3052, 0x6000, 5 |
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
87 |
#define Beckhoff_EL5101_Window 0x00000002, 0x13ED3052, 0x6000, 6 |
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
88 |
#define Beckhoff_EL5101_Ctrl 0x00000002, 0x13ED3052, 0x7000, 1 |
60b2aad9d40b
MERGE trunk -r573:587 -> branches/stable-1.1 (race, bootstrap, mailbox bugfix, debug interface switch)
Florian Pose <fp@igh-essen.com>
parents:
1719
diff
changeset
|
89 |
#define Beckhoff_EL5101_OutputValue 0x00000002, 0x13ED3052, 0x7000, 2 |
1719
42ed27ae6785
MERGE trunk -r516:527 -> branches/stable-1.1 (jiffies, bugfixes, pdo defines)
Florian Pose <fp@igh-essen.com>
parents:
1717
diff
changeset
|
90 |
|
1717
cc1ee18207d3
MERGE trunk -r513:515 -> branches/stable-1.1 (Missing code docs)
Florian Pose <fp@igh-essen.com>
parents:
1716
diff
changeset
|
91 |
/** \endcond */ |
cc1ee18207d3
MERGE trunk -r513:515 -> branches/stable-1.1 (Missing code docs)
Florian Pose <fp@igh-essen.com>
parents:
1716
diff
changeset
|
92 |
|
1715
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
93 |
/*****************************************************************************/ |
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
94 |
|
e675450f2174
MERGE trunk -r463:494 -> branches/stable-1.1 (Version 1.1)
Florian Pose <fp@igh-essen.com>
parents:
diff
changeset
|
95 |
#endif |