Skip to content

Commit 6f4594c

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents fcdcfd0 + 4029e60 commit 6f4594c

File tree

3 files changed

+23
-7
lines changed

3 files changed

+23
-7
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The "New" BSD License:
22
**********************
33

4-
Copyright (c) 2005-2013, The Dojo Foundation
4+
Copyright (c) 2005-2014, The Dojo Foundation
55
All rights reserved.
66

77
Redistribution and use in source and binary forms, with or without

README.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,22 @@ All contributions require a [Dojo Foundation CLA](http://dojofoundation.org/abou
2020

2121
This project requires the following other project to run:
2222

23-
* requirejs
23+
* requirejs
2424

2525
## Installation
2626

27-
* Bower release installation: `bower install requirejs-dplugins`
27+
_Bower_ release installation:
2828

29-
* Manual master installation: go to the root Dojo installation directory and clone requirejs-dplugins from github:
29+
$ bower install requirejs-dplugins
3030

31-
`$ git clone git://github.com/ibm-js/requirejs-dplugins.git`
31+
_Manual_ master installation:
3232

33+
$ git clone git://github.com/ibm-js/requirejs-dplugins.git
34+
35+
Then install dependencies with bower (or manually from github if you prefer to):
36+
37+
$ cd requirejs-dplugins
38+
$ bower install
3339

3440
## Documentation
3541
### i18n

bower.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
{
2-
"name": "requirejs-dplugins",
3-
"version": "0.1.0-dev"
2+
"name": "requirejs-dplugins",
3+
"version": "0.1.0-dev",
4+
"dependencies": {
5+
"requirejs": "2.1.x"
6+
},
7+
"ignore": [
8+
".jshintrc",
9+
".gitattributes",
10+
".travis.yml",
11+
"tests",
12+
"CONTRIBUTING.md"
13+
]
414
}

0 commit comments

Comments
 (0)