From 5e2c384aa73d2e9e2f5f6e3ce053aeb96f2ebac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Ple=C3=9F?= Date: Fri, 15 Jun 2012 20:56:02 +0200 Subject: [PATCH] Merge branch 'master' of /home/lucas/ctdo/crashtest-player with conflicts. --- .gitignore | 3 +- .idea/workspace.xml | 635 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 637 insertions(+), 1 deletion(-) create mode 100644 .idea/workspace.xml diff --git a/.gitignore b/.gitignore index 981aeb8..bb31aac 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/out \ No newline at end of file +/out +.idea/workspace.xml \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..44b10f2 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,635 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + localhost + 5050 + + + + + + + + + 1339452055659 + 1339452055659 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + crashtestcardplayer + + + + + + + + No facets are configured + + + + + + + + + + + + + + + 1.6 + + + + + + + + crashtestCardPlayer + + + + + + + + 1.6 + + + + + + + + jerklib + + + + + + + + +