summaryrefslogtreecommitdiffstats
path: root/Dozentenmodul/src/gui/intro/About_GUI.java
diff options
context:
space:
mode:
authorTobias Spitzer2014-08-26 07:42:14 +0200
committerTobias Spitzer2014-08-26 07:42:14 +0200
commit4fcc347e9b95c5dbf7ab2df310e66892c8da4380 (patch)
treea270ce5b3735ebe99b8b2df1efe9eb56d04f9296 /Dozentenmodul/src/gui/intro/About_GUI.java
parentsfda (diff)
parentdate geändert (diff)
downloadtutor-module-4fcc347e9b95c5dbf7ab2df310e66892c8da4380.tar.gz
tutor-module-4fcc347e9b95c5dbf7ab2df310e66892c8da4380.tar.xz
tutor-module-4fcc347e9b95c5dbf7ab2df310e66892c8da4380.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module
Conflicts: Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class fsad
Diffstat (limited to 'Dozentenmodul/src/gui/intro/About_GUI.java')
-rw-r--r--Dozentenmodul/src/gui/intro/About_GUI.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/Dozentenmodul/src/gui/intro/About_GUI.java b/Dozentenmodul/src/gui/intro/About_GUI.java
index 03ca2d16..644e84dc 100644
--- a/Dozentenmodul/src/gui/intro/About_GUI.java
+++ b/Dozentenmodul/src/gui/intro/About_GUI.java
@@ -23,6 +23,8 @@ public class About_GUI extends JFrame {
private JPanel contentPane;
private JTextPane txtpnVersionVBuilddate;
+ private String buildDate ="25.08.2014";
+ private String version="1.01";
/**
* Create the frame.
@@ -86,7 +88,7 @@ public class About_GUI extends JFrame {
txtpnVersionVBuilddate = new JTextPane();
txtpnVersionVBuilddate
- .setText("Version: v1.0\r\nBuild-Date: 22.08.2014\r\n\r\nContact: michael.wilson@hs-offenburg.de\r\nWebsite: http://bwlehrpool.hs-offenburg.de/");
+ .setText("Version: "+version+"\r\nBuild-Date: "+buildDate+"\r\n\r\nContact: michael.wilson@hs-offenburg.de\r\nWebsite: http://bwlehrpool.hs-offenburg.de/");
txtpnVersionVBuilddate.setEditable(false);
txtpnVersionVBuilddate.setBackground(SystemColor.menu);
txtpnVersionVBuilddate.setBounds(62, 95, 224, 90);