aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHerbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com>2010-11-04 01:29:10 +0100
committerHerbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com>2010-11-04 01:29:10 +0100
commit513a2b910899567f0a37bf8186d8b1878eac9476 (patch)
tree717d369c0a6f7285d613d1fbe640705f1e882149 /src
parent1289e75310955572d788c26015b10e6ecf253bc2 (diff)
parentb3cba0081dc0401c272ee0ecbad31d21d53bb9c2 (diff)
downloadBlueGPS-513a2b910899567f0a37bf8186d8b1878eac9476.zip
BlueGPS-513a2b910899567f0a37bf8186d8b1878eac9476.tar.gz
BlueGPS-513a2b910899567f0a37bf8186d8b1878eac9476.tar.bz2
Merge branch 'dev_1.1.x' into dev_1.2.x
externalization of version name Conflicts: AndroidManifest.xml
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions