Skip to content

Commit f26b854

Browse files
Merge branch 'master' into release
Conflicts: Android/AndroidManifest.xml
2 parents 7dc7462 + 8b2b7fe commit f26b854

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

Android/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="org.droidplanner"
4-
android:versionCode="79"
4+
android:versionCode="80"
55
android:versionName="please run version.sh to get the version name">
66

77
<uses-sdk

ChangeLog.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ Our convention for release control is the following (for a release like DPvA.B.C
88
All the changes are logged below (preferable with the pull request numbers in parenteses):
99

1010
# Releases
11+
## Droidplanner v2.4.3
12+
* Improve analytics (#829)
13+
* Fixed German translation (#831)
14+
* Restructuring Settings menu (#815)
15+
* Updating parameters description (#828)
16+
* Adding support for direct connections to the Pixhawk (#816)
17+
* Travis CI integration (#821,#824,#829)
18+
* Fixing log bufferoverflow exception (#834)
19+
1120
## Droidplanner v2.4.2
1221
* Added google analytics (#813)
1322
* Update google play services (#813)

0 commit comments

Comments
 (0)