forked from romovs/amber
-
Notifications
You must be signed in to change notification settings - Fork 0
/
hoilmtfd.tco.txt
78 lines (74 loc) · 2.6 KB
/
hoilmtfd.tco.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
Merge remote-tracking branch 'refs/remotes/romovs/master'
# Conflicts:
# src/haven/BGL.java
# src/haven/Config.java
# src/haven/MapView.java
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 8 commits.
# (use "git push" to publish your local commits)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
# modified: build.xml
# modified: etc/locdiff/Main.java
# modified: etc/run_debug.bat
# modified: l10n/action_ru.properties
# modified: l10n/button_ru.properties
# modified: l10n/flower_en.properties
# modified: l10n/flower_ru.properties
# modified: l10n/label_en.properties
# new file: l10n/label_ru.properties
# modified: l10n/msg_en.properties
# new file: l10n/msg_ru.properties
# modified: l10n/pagina_en.properties
# new file: l10n/pagina_ru.properties
# modified: l10n/tooltip_en.properties
# modified: l10n/tooltip_ru.properties
# modified: l10n/window_ru.properties
# deleted: lib/jnlp.jar
# deleted: lib/jsoup-1.8.3.jar
# modified: src/haven/BGL.java
# new file: src/haven/BufferBGL.java
# modified: src/haven/Button.java
# modified: src/haven/CharWnd.java
# modified: src/haven/Config.java
# new file: src/haven/CurioStudyTimes.java
# modified: src/haven/DisplayList.java
# modified: src/haven/Dropbox.java
# modified: src/haven/FlowerMenu.java
# modified: src/haven/GItem.java
# modified: src/haven/GLBuffer.java
# modified: src/haven/GLFrameBuffer.java
# modified: src/haven/GLObject.java
# modified: src/haven/GLProgram.java
# modified: src/haven/GLShader.java
# modified: src/haven/GLState.java
# modified: src/haven/GLVertexArray.java
# modified: src/haven/GOut.java
# modified: src/haven/GameUI.java
# modified: src/haven/HavenPanel.java
# deleted: src/haven/JnlpBrowser.java
# deleted: src/haven/JnlpCache.java
# modified: src/haven/MainFrame.java
# modified: src/haven/Makewindow.java
# modified: src/haven/MapView.java
# modified: src/haven/MenuGrid.java
# modified: src/haven/Message.java
# modified: src/haven/OptWnd.java
# modified: src/haven/ResCache.java
# modified: src/haven/Resource.java
# deleted: src/haven/StudyTimes.java
# modified: src/haven/TexGL.java
# modified: src/haven/Utils.java
# modified: src/haven/Widget.java
# modified: src/haven/Window.java
# modified: src/haven/rs/GBuffer.java
#