qgis · Jan 14, 2016
diff --git a/‎python/plugins/processing/algs/qgis/Merge.py
Lines changed: 1 addition & 1 deletion b/‎python/plugins/processing/algs/qgis/Merge.py
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/app/main.cpp
Lines changed: 1 addition & 1 deletion b/‎src/app/main.cpp
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/testdata/control_images/expected_geometry_part_count/expected_geometry_part_count_mask.png
5.37 KB b/‎tests/testdata/control_images/expected_geometry_part_count/expected_geometry_part_count_mask.png
5.37 KB
diff --git a/‎tests/testdata/control_images/expected_geometry_part_num/expected_geometry_part_num_mask.png
5.37 KB b/‎tests/testdata/control_images/expected_geometry_part_num/expected_geometry_part_num_mask.png
5.37 KB
diff --git a/‎tests/testdata/control_images/labelingenginev2/expected_label_order_layer2/expected_label_order_layer2_mask.png
1.33 KB b/‎tests/testdata/control_images/labelingenginev2/expected_label_order_layer2/expected_label_order_layer2_mask.png
1.33 KB
@@ -84,7 +84,7 @@ def processAlgorithm(self, progress):
         total = 100.0 / float(totalFeatureCount)
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
             fields.toList(), layers[0].dataProvider().geometryType(),
-                layers[0].crs())
+            layers[0].crs())
 
         featureCount = 0
         for layer in layers:
 
@@ -307,7 +307,7 @@ void qgisCrash( int signal )
       if ( gdbpid == 0 )
       {
         // attach, backtrace and continue
-        execl( "/usr/bin/gdb", "gdb", "-q", "-batch", "-n", pidstr, "-ex", "thread", "-ex", "bt full", exename, nullptr );
+        execl( "/usr/bin/gdb", "gdb", "-q", "-batch", "-n", pidstr, "-ex", "thread", "-ex", "bt full", exename, NULL );
         perror( "cannot exec gdb" );
         exit( 1 );
       }
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ void qgisCrash( int signal )`
`307`	`307`	`if ( gdbpid == 0 )`
`308`	`308`	`{`
`309`	`309`	`// attach, backtrace and continue`
`310`		`- execl( "/usr/bin/gdb", "gdb", "-q", "-batch", "-n", pidstr, "-ex", "thread", "-ex", "bt full", exename, nullptr );`
	`310`	`+ execl( "/usr/bin/gdb", "gdb", "-q", "-batch", "-n", pidstr, "-ex", "thread", "-ex", "bt full", exename, NULL );`
`311`	`311`	`perror( "cannot exec gdb" );`
`312`	`312`	`exit( 1 );`
`313`	`313`	`}`