nitlanguage
/
nit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fefc015
9fa18ae
)
Merge remote-tracking branch 'lucas/ropes'
author
Jean Privat
<jean@pryen.org>
Mon, 9 Sep 2013 17:09:51 +0000
(13:09 -0400)
committer
Jean Privat
<jean@pryen.org>
Mon, 9 Sep 2013 17:09:51 +0000
(13:09 -0400)
Conflicts:
lib/standard/standard.nit
1
2
lib/standard/standard.nit
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/standard/standard.nit
index
a0a4d6e
,
e329660
..
1ef4508
---
1
/
lib/standard/standard.nit
---
2
/
lib/standard/standard.nit
+++ b/
lib/standard/standard.nit
@@@
-13,9
-13,9
+13,10
@@@
# Standard classes and methods used by default by Nit programs and libraries.
# This module is implicitly imported by every module.
-package standard
+module standard
+import posix
+ import ropes
import environ
import time
import string_search