Skip to content

Commit a90be95

Browse files
jef-njef-n
committedFeb 14, 2016
sip sync
·
ltr-3_40archive/master_2
1 parent 67d8935 commit a90be95

File tree

419 files changed

+5797
-4219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

419 files changed

+5797
-4219
lines changed
 

‎doc/news.t2t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ This is a minor release increment with the following new features:
6464
- Tweaks to label properties dialog.
6565
- Support for non-latin scripts for curved labels.
6666
- "Follow point" alignment for multiline labels.
67-
- Support overriden layer styles also in the composer legend.
67+
- Support overridden layer styles also in the composer legend.
6868
- Add scalebar sizing mode to fit a desired scalebar width.
6969
- Plugins can now create their own entries in the browser.
7070
- More uniform and predictable names for processing outputs.

‎python/analysis/interpolation/NormVecDecorator.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class NormVecDecorator : TriDecorator
3030
bool getTriangle( double x, double y, Point3D* p1 /Out/, Vector3D* v1 /Out/, Point3D* p2 /Out/, Vector3D* v2 /Out/, Point3D* p3 /Out/, Vector3D* v3 /Out/ );
3131
/** This function behaves similar to the one above. Additionally, the numbers of the points are returned (ptn1, ptn2, ptn3) as well as the pointStates of the triangle points (state1, state2, state3)
3232
* @note not available in Python bindings
33-
*/
33+
*/
3434
//bool getTriangle( double x, double y, Point3D* p1 /Out/, int* ptn1 /Out/, Vector3D* v1 /Out/, pointState* state1 /Out/, Point3D* p2 /Out/, int* ptn2 /Out/, Vector3D* v2 /Out/, pointState* state2 /Out/, Point3D* p3 /Out/, int* ptn3 /Out/, Vector3D* v3 /Out/, pointState* state3 /Out/);
3535
/** Returns the state of the point with the number 'pointno'*/
3636
pointState getState( int pointno ) const;

0 commit comments

Comments
 (0)
Please sign in to comment.