diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-05-04 22:13:48 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-05-04 22:13:48 -0400 |
commit | 8001e3284e069dded37a1aa42b25c201102b9460 (patch) | |
tree | 39d985f62caf6f9d24fa7f9de628668c26009775 /res/values/colors.xml | |
parent | c4e1aa78bc868d2ee8c8fc01bf7224b98f5524dd (diff) | |
parent | 8662dfb7361c7ba9291a5e2bf9ebd55cb41932ba (diff) |
Merge branch 'lukeshu'
Conflicts:
src/us/minak/OnGestureRecognizedListener.java
Diffstat (limited to 'res/values/colors.xml')
-rw-r--r-- | res/values/colors.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml new file mode 100644 index 0000000..c180987 --- /dev/null +++ b/res/values/colors.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="gesture_color">#FFFFFF00</color> +</resources> |