Skip to content

Commit 247ad1f

Browse files
authored
Merge pull request #1 from realpdai/master
更新fork
2 parents 51d1f88 + b99349c commit 247ad1f

File tree

70 files changed

+1106
-40
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1106
-40
lines changed

.classpath

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@
3636
<attribute name="m2e-apt" value="true"/>
3737
</attributes>
3838
</classpathentry>
39+
<classpathentry kind="lib" path="lib/GNDecorator-2.1.2-alpha.jar"/>
3940
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
4041
<attributes>
41-
<attribute name="ignore_optional_problems" value="true"/>
42-
<attribute name="test" value="true"/>
4342
<attribute name="optional" value="true"/>
4443
<attribute name="maven.pomderived" value="true"/>
44+
<attribute name="ignore_optional_problems" value="true"/>
4545
<attribute name="m2e-apt" value="true"/>
46+
<attribute name="test" value="true"/>
4647
</attributes>
4748
</classpathentry>
48-
<classpathentry kind="lib" path="lib/GNDecorator-2.1.2-alpha.jar"/>
4949
<classpathentry kind="output" path="target/classes"/>
5050
</classpath>

.idea/$CACHE_FILE$

+26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.gitignore

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.name

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

+21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/encodings.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

+20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__com_jfoenix_jfoenix_8_0_7.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__de_jensd_fontawesomefx_8_9.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__eu_hansolo_colors_1_4.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__eu_hansolo_tilesfx_1_6_5.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__gn_GNAvatarView_v1_0_rc.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__gn_GNButton_v1_1_0.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__gn_GNCalendar_v1_0.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__gn_GNCarousel_v2_1_5.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__gn_GNDecorator_v2_1_2_alpha.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__io_github_typhon0_AnimateFX_1_2_1.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Maven__junit_junit_4_12.xml

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)