Skip to content

Commit

Permalink
Merge branch 'master' from mainline into saphirion
Browse files Browse the repository at this point in the history
Merged with 4d9840f from
https://github.com/rebol/rebol.

* master:
  Delete unused header file
  Add an example of platform ID Add an example of make clean "make r3" can be used Rename REBOL to Rebol
  Remove and ignore generated file src/boot/host-init.r
  Clean up browser calls for POSIX platforms.
  Implement BROWSE on Mac OS X.

git-svn-id: https://s1.saphirion.com/svn/rm-asset/trunk/r3@5303 0b15d6fc-ce89-4483-8625-0b0fabc32e25
  • Loading branch information
andreasbolka committed Sep 9, 2013
2 parents 4d9840f + 3cca4f0 commit 028903b
Show file tree
Hide file tree
Showing 131 changed files with 28,874 additions and 4,443 deletions.
3 changes: 0 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
Expand Down
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,19 @@
## REBOL R3
#################

make/r3*
make/r3.dll
make/r3-core.exe
make/r3-core-host.exe
make/r3-view.exe
make/r3-view-host.exe
make/objs/
src/boot/boot-code.r
src/boot/host-init.r
src/core/b-boot.c
src/include/ext-types.h
src/include/host-*
src/include/host-ext-*
src/include/host-init.h
src/include/host-lib.h
src/include/reb-dialect.h
src/include/reb-evtypes.h
src/include/reb-lib-lib.h
Expand Down
19 changes: 19 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
REBOL [R3] Language Interpreter and Run-time Environment
Copyright 2012 REBOL Technologies
REBOL is a trademark of REBOL Technologies
Additional code modifications and improvements Copyright 2012 Saphirion
Licensed under the Apache License, Version 2.0
See included LICENSE file for details

Expand Down Expand Up @@ -32,3 +33,21 @@ This file is part of the Independent JPEG Group's software.
dtoa:
The author of this software is David M. Gay.
Copyright (c) 1991, 2000, 2001 by Lucent Technologies.

bigint:
Copyright (c) 2007, Cameron Rich

AES:
Copyright (c) 2007, Cameron Rich

DH:
Copyright (c) 2013 Richard Smolak

RC4:
Copyright (c) 2007, Cameron Rich

LodePNG:
Copyright (c) 2005-2013 Lode Vandevenne

Anti-Grain Geometry:
Copyright (C) 2002-2005 Maxim Shemanarev
Loading

0 comments on commit 028903b

Please sign in to comment.