diff options
author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-10-19 04:01:38 -0700 |
---|---|---|
committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-10-19 04:01:38 -0700 |
commit | fc892176ec4fd877bae4fc31ad7769ec15bbd858 (patch) | |
tree | c8df8b1b41bc102d689b029be7948e2245fda413 /test/disabled/presentation/doc/src | |
parent | ed80616ccd9de9fead9553a93c5fbddfc1ea4275 (diff) | |
parent | e9307e17990ed536e437755a87f41cbd98fb62fc (diff) | |
download | scala-fc892176ec4fd877bae4fc31ad7769ec15bbd858.tar.gz scala-fc892176ec4fd877bae4fc31ad7769ec15bbd858.tar.bz2 scala-fc892176ec4fd877bae4fc31ad7769ec15bbd858.zip |
Merge pull request #3051 from retronym/merge/2.10.x-to-master-4
Merge 2.10.x to master (again)
Diffstat (limited to 'test/disabled/presentation/doc/src')
-rwxr-xr-x | test/disabled/presentation/doc/src/Class.scala | 1 | ||||
-rwxr-xr-x | test/disabled/presentation/doc/src/p/Base.scala | 11 | ||||
-rwxr-xr-x | test/disabled/presentation/doc/src/p/Derived.scala | 9 |
3 files changed, 21 insertions, 0 deletions
diff --git a/test/disabled/presentation/doc/src/Class.scala b/test/disabled/presentation/doc/src/Class.scala new file mode 100755 index 0000000000..a974bd6f5c --- /dev/null +++ b/test/disabled/presentation/doc/src/Class.scala @@ -0,0 +1 @@ +object Class
\ No newline at end of file diff --git a/test/disabled/presentation/doc/src/p/Base.scala b/test/disabled/presentation/doc/src/p/Base.scala new file mode 100755 index 0000000000..d91632b6f6 --- /dev/null +++ b/test/disabled/presentation/doc/src/p/Base.scala @@ -0,0 +1,11 @@ +package p + +/** + * @define BaseComment This is $BaseVar comment. + */ +trait Base { + /** + * Base method has documentation. + */ + def foo: String +} diff --git a/test/disabled/presentation/doc/src/p/Derived.scala b/test/disabled/presentation/doc/src/p/Derived.scala new file mode 100755 index 0000000000..1a9c9a26d1 --- /dev/null +++ b/test/disabled/presentation/doc/src/p/Derived.scala @@ -0,0 +1,9 @@ +package p + +/** + * $BaseComment + * @define BaseVar Derived + */ +class Derived extends Base { + def foo = "" +} |