Changes between Version 26 and Version 27 of pps/tutorial
- Timestamp:
- Oct 5, 2011, 3:58:23 PM (13 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
pps/tutorial
v26 v27 153 153 2. In order to avoid conflicts copy your file (''AutonomousDroneController.cc''): 154 154 {{{ 155 ~/orxonox/tutorial$ svn cp src/orxonox/ objects/controllers/AutonomousDroneController.cc src/orxonox/objects/controllers/AutonomousDroneController_myUserName.cc155 ~/orxonox/tutorial$ svn cp src/orxonox/controllers/AutonomousDroneController.cc src/orxonox/controllers/AutonomousDroneController_myUserName.cc 156 156 }}} 157 157 3. Make sure you don't commit any changes of the original file, so revert your local changes on it: 158 158 {{{ 159 ~/orxonox/tutorial$ svn revert src/orxonox/ objects/controllers/AutonomousDroneController.cc159 ~/orxonox/tutorial$ svn revert src/orxonox/controllers/AutonomousDroneController.cc 160 160 }}} 161 161 4. Now commit: