AndroidAPS/app/src/main/res/values
Johannes Mockenhaupt 89d59584d5
Merge remote-tracking branch 'origin/dev' into dev-merge
* origin/dev:
  prepend line feed like suggested on jamoto code review
  Rename method to reflect jomoto code review
  Unit tests are always in engmode
  Fix boolean stuff in accordance to code review with adrian
  Cleanup boolean algrabra, add method for environment retrieval from logcontexxt
  Determine directory from logback
  more checks for null profile
  Disallow profile store on pump if on dev branch but not in engineering mode
  Disable profile switch if not in Engineering mode and on dev branch
  Add info to About dialog when engineering mode is enabled.
  On start, show notification if on dev-branch, but not EM, so CL is disabled.
  Add basic Engineering mode.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/MainActivity.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
#	app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
#	app/src/main/res/values/strings.xml
2018-03-18 19:47:23 +01:00
..
arrays.xml Chinese to menu 2018-02-20 17:04:15 +01:00
colors.xml Moar buttons. 2018-02-18 11:06:36 +01:00
dimens.xml Objectives design 2016-06-04 17:28:05 +02:00
layout.xml gui tweaking 2017-06-03 22:43:35 +02:00
strings.xml Merge remote-tracking branch 'origin/dev' into dev-merge 2018-03-18 19:47:23 +01:00
styles.xml ns alarm setting in xml 2017-06-15 21:33:45 +02:00