Merge branch 'new_tree' into 'master'

- Substitute christmas-tree, as the newly added Christmastree is too bulky to be viewed within split-window Mail tools such as Thunderbird.
This commit is contained in:
Oliver Rümpelein 2015-01-06 17:00:05 +01:00
commit fa9a0941d7
2 changed files with 21 additions and 56 deletions

View file

@ -6,7 +6,7 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Source of ASCII-Art:
christmastree:
christmastree: jgs, from http://chris.com/ascii/index.php?art=holiday/christmas/trees
pizza: http://www.fiikus.net/asciiart/pizza.txt
heart: Norman Veilleux/Ryan Harding, from http://www.ascii-fr.com/-Hearts-.html
birthdaycake: http://chris.com/ascii/index.php?art=events/birthday

View file

@ -1,55 +1,20 @@
XX XX
X XX XXX XXX X XX X XX XX XXX
X X X X XX X X X X X X X X X XX
X X X XX X X XX XX X XX
X X X XX X X X X XXX
X X X XX XX X X XX
X X X XX X X X X XX XX
X X X XX XXXX X X X X X XX
X X XX + //+ XX XX
X XX XX X +////+ XXX
XXX XX X +//////+
XXX +/ //////+
+/// //////+ +
+////// ////+ !
+///////// // + +-- --+
+////////// //+ !
+/////////// ////+ +
+ +////////// /// ////+
! + ////// ////// ///+
+-- --+ +/ /// ///////// //+
! +/( + )/////////// /+
+ / +//( + )//////////// /+ /
-X- +//// /////////////+ -X-
M +////// /////////// /+ M
A + ////////// ////////////+ A
S +///////////// ////////// /+ S
/ +/////////////// //////// //+ /
-X- O +///////////// ///// //////+ -X-
M + //////////////( // ////////+ / M
A +/// //////////////// //////////+ A
/ S+//////// ////////////// /////////////+ S + /
-X- O +///// /////////// /// ////////+ O -X-
M +//////// ///////// ////// ///////+ / M
A +/////////// ////// ///////// ///////+ A
/ S +/////////////// // ///////////// ///////+ S /
-X- +/+////////////////// ///////////////// ///////// + -X-
M +/////////////////// / ////////////////// //+ O / M
A O +//////////// ///// ////////////////// ///+ A
S//////////////////// ///////// ////////////////// ////////S
+////////////////// /////////// /////////////////// //////+
+////////////// ////////MERRY/ ////////////////// ///+
+///////// /////+ CHRISTMAS ///////////////////+
+ ++++++++++++ CHRISTMAS +++++++++++++++++
X CHRISTMAS
XXXXXX X CHRISTMAS
XX XX X X
XX X X X X
XX XX X X X
XX X XXX X XX XXXX XXXXX XX XXXX
XX XX X X X X X X X X X X X X X
XX XXX X X XX X XXX X X XX XX X X XXX
XX X X X X X X XX X XX X X XXXX XX
XX X X X X X X X X X X X X X X X X
XXXXXX X X X X X X X XXXX X X X X X X XXXX
X
|
\ ' /
-- (*) --
>*<
>0<@<
>>>@<<*
>@>*<0<<<
>*>>@<<<@<<
>@>>0<<<*<<@<
>*>>0<<@<<<@<<<
>@>>*<<@<>*<<0<*<
\*/ >0>>*<<@<>0><<*<@<<
___\\U//___ >*>>@><0<<*>>@><*<0<<
|\\ | | \\| >@>>0<*<0>>@<<0<<<*<@<<
| \\| | _(UU)_ >((*))_>0><*<0><@<<<0<*<
|\ \| || / //||.*.*.*.|>>@<<*<<@>><0<<<
|\\_|_|&&_// ||*.*.*.*|_\\db//_
""""|'.'.'.|~~|.*.*.*| ____|_
|'.'.'.| ^^^^^^|____|>>>>>>|
~~~~~~~~ '""""`------'