Merge branch 'master' of git@github.com:DjBushido/itcs4180.git

master
tokugawa 2014-04-25 19:58:33 -04:00
commit 7ce4b9e0bf
1 changed files with 1 additions and 1 deletions

View File

@ -4,7 +4,7 @@
<string name="app_name">UNCC Scavenger</string>
<string name="action_settings">Settings</string>
<string name="hello_world">Hello world!</string>
<string name="endpoint">http://djbushido.no-ip.org/</string>
<string name="endpoint">http://ec2-54-187-106-212.us-west-2.compute.amazonaws.com/</string>
<string name="title_activity_search">SearchActivity</string>
<string name="title_activity_compass">CompassActivity</string>
<string name="title_activity_found">FoundActivity</string>