Commit [27f1c8]  Maximize  Restore  History

Fix conflicts. I'm not really sure why these are conflicts though!

gloomyandy gloomyandy 2014-06-02

1 2 3 .. 8 > >> (Page 1 of 8)
added BrickPiTest/.settings/org.eclipse.jdt.core.prefs
added BrickPiTest/build.xml
added BrickPiTest/src/LEDTest.java
added BrickPiTest/src/MotorTest.java
added BrickPiTest/src/S5Test.java
added BrickPiTest/src/SensorTest.java
added BrickPiTest/src/SoundTest.java
copied EV3AndroidMenu/.classpath -> android/EV3AndroidControl/.classpath
copied EV3AndroidMenu/.gitignore -> android/EV3AndroidControl/.gitignore
copied (with changes) EV3AndroidMenu/.project -> android/EV3AndroidControl/.project
copied EV3AndroidMenu/.settings/org.eclipse.jdt.core.prefs -> android/EV3AndroidControl/.settings/org.eclipse.jdt.core.prefs
copied (with changes) EV3AndroidMenu/AndroidManifest.xml -> android/EV3AndroidControl/AndroidManifest.xml
copied EV3AndroidMenu/ic_launcher-web.png -> android/EV3AndroidControl/ic_launcher-web.png
copied EV3AndroidMenu/proguard-project.txt -> android/EV3AndroidControl/proguard-project.txt
copied (with changes) EV3AndroidMenu/project.properties -> android/EV3AndroidControl/project.properties
copied EV3AndroidMenu/res/drawable-hdpi/ic_launcher.png -> android/EV3AndroidControl/res/drawable-hdpi/ic_launcher.png
copied EV3AndroidMenu/res/drawable-mdpi/ic_launcher.png -> android/EV3AndroidControl/res/drawable-mdpi/ic_launcher.png
copied EV3AndroidMenu/res/drawable-xhdpi/ic_launcher.png -> android/EV3AndroidControl/res/drawable-xhdpi/ic_launcher.png
changed EV3SensorMonitor/.classpath
copied (with changes) EV3SensorMonitor/.classpath -> BrickPiTest/.classpath
changed EV3SensorMonitor/.gitignore
copied (with changes) EV3SensorMonitor/.gitignore -> BrickPiTest/.gitignore
changed EV3SensorMonitor/.project
copied (with changes) EV3SensorMonitor/.project -> BrickPiTest/.project
added android/EV3AndroidControl/libs/android-support-v4.jar
BrickPiTest/.settings/org.eclipse.jdt.core.prefs Diff Switch to side-by-side view
Loading...
BrickPiTest/build.xml Diff Switch to side-by-side view
Loading...
BrickPiTest/src/LEDTest.java Diff Switch to side-by-side view
Loading...
BrickPiTest/src/MotorTest.java Diff Switch to side-by-side view
Loading...
BrickPiTest/src/S5Test.java Diff Switch to side-by-side view
Loading...
BrickPiTest/src/SensorTest.java Diff Switch to side-by-side view
Loading...
BrickPiTest/src/SoundTest.java Diff Switch to side-by-side view
Loading...
EV3AndroidMenu/.project to android/EV3AndroidControl/.project Diff Switch to side-by-side view
Loading...
EV3AndroidMenu/AndroidManifest.xml to android/EV3AndroidControl/AndroidManifest.xml Diff Switch to side-by-side view
Loading...
EV3AndroidMenu/project.properties to android/EV3AndroidControl/project.properties Diff Switch to side-by-side view
Loading...
EV3SensorMonitor/.classpath Diff Switch to side-by-side view
Loading...
EV3SensorMonitor/.classpath to BrickPiTest/.classpath Diff Switch to side-by-side view
Loading...
EV3SensorMonitor/.gitignore Diff Switch to side-by-side view
Loading...
EV3SensorMonitor/.gitignore to BrickPiTest/.gitignore Diff Switch to side-by-side view
Loading...
EV3SensorMonitor/.project Diff Switch to side-by-side view
Loading...
EV3SensorMonitor/.project to BrickPiTest/.project Diff Switch to side-by-side view
Loading...
1 2 3 .. 8 > >> (Page 1 of 8)

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:

JavaScript is required for this form.





No, thanks