Merge branch 'master' into gsoc2012-scilab
Conflicts: .gitignore .travis.yml COPYRIGHT Examples/Makefile.in Examples/test-suite/constructor_copy.i Makefile.in configure.ac
This commit is contained in:
commit
07b06a4089
1502 changed files with 46955 additions and 11374 deletions
|
|
@ -225,10 +225,10 @@ __rshift__,__lshift__ >>,<<
|
|||
|
||||
__getitem__,__setitem__ for operator[]
|
||||
|
||||
Operators overloaded without C++ equivilents
|
||||
Operators overloaded without C++ equivalents
|
||||
__pow__ for power operator
|
||||
__str__ converts object to a string (should return a const char*)
|
||||
__concat__ for contatenation (if language supports)
|
||||
__concat__ for concatenation (if language supports)
|
||||
|
||||
*/
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue