aboutsummaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorJean Fabre-Monplaisir <jean-isaac-fm@live.fr>2015-02-01 19:06:59 +0100
committerJean Fabre-Monplaisir <jean-isaac-fm@live.fr>2015-02-01 19:06:59 +0100
commit93cd8ba7c9ea2ee22bfcb828cd5190c4662a05b0 (patch)
tree8bdaae15ed9302409756a10faec053db5aea122a /main.cpp
parent2cb65f6726bbdecdc57b1544fe11fa6c586783dc (diff)
parent3b8497a4d6c71ac542a2992a645c00bf99d45390 (diff)
downloadRobotique-Projet-93cd8ba7c9ea2ee22bfcb828cd5190c4662a05b0.tar.gz
Robotique-Projet-93cd8ba7c9ea2ee22bfcb828cd5190c4662a05b0.zip
Merge branch 'master' of github.com:Alexis211/Robotique
Conflicts: problem.cpp
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/main.cpp b/main.cpp
index d1fa143..440a12f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,9 +4,9 @@
int main() {
hilare_a_param p;
- p.l = 30;
- p.r_c_car = 15;
- p.r_c_trolley = 12;
+ p.l = 50;
+ p.r_c_car = 25;
+ p.r_c_trolley = 20;
UI the_ui(&p);