File tree Expand file tree Collapse file tree 1 file changed +7
-7
lines changed
src/org/openpatch/scratch Expand file tree Collapse file tree 1 file changed +7
-7
lines changed Original file line number Diff line number Diff line change 4
4
5
5
public class Window {
6
6
7
- public static final int [] DEBUG_COLOR = { 255 , 0 , 0 };
7
+ public static final int [] DEBUG_COLOR = {255 , 0 , 0 };
8
8
private static Window instance ;
9
9
10
10
public Window () {
@@ -34,12 +34,12 @@ public static Window getInstance() {
34
34
}
35
35
36
36
/**
37
- * Gets the seconds passed since the last frame.
38
- <<<<<<< HEAD
39
- *
40
- =======
37
+ * Gets the seconds passed since the last frame. <<<<<<< HEAD
38
+ *
39
+ * <p>=======
40
+ *
41
+ * <p>>>>>>>> c0eac5706fdcd98090dbc99a6d5b478a5c0bd3b3
41
42
*
42
- >>>>>>> c0eac5706fdcd98090dbc99a6d5b478a5c0bd3b3
43
43
* @return seconds since last frame
44
44
*/
45
45
public float getDeltaTime () {
@@ -72,7 +72,7 @@ public void setStage(Stage stage) {
72
72
73
73
/**
74
74
* @deprecated since 4.0.0. Use setStage instead.
75
- * @param name Name of the stage
75
+ * @param name Name of the stage
76
76
* @param stage A stage object
77
77
*/
78
78
public void addStage (String name , Stage stage ) {
You can’t perform that action at this time.
0 commit comments