Changes between Version 12 and Version 13 of pps/tutorial_new
- Timestamp:
- Mar 9, 2009, 4:29:04 PM (16 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
pps/tutorial_new
v12 v13 110 110 2. in order to avoid conflicts copy your file (DroneController.cc) 111 111 {{{ 112 ~/orxonox/tutorial$ svn cp src/orxonox/ controllers/DroneController.cc src/orxonox/controllers/DroneController.cc_myUserName112 ~/orxonox/tutorial$ svn cp src/orxonox/objects/controllers/DroneController.cc src/orxonox/objects/controllers/DroneController.cc_myUserName 113 113 }}} 114 114 3. make sure you dont commit any changes of the original file, so revert your local changes on it: 115 115 {{{ 116 ~/orxonox/tutorial$ svn revert src/orxonox/ controllers/DroneController.cc116 ~/orxonox/tutorial$ svn revert src/orxonox/objects/controllers/DroneController.cc 117 117 }}} 118 118 4. now commit