diff options
| author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-22 18:18:27 +0200 |
|---|---|---|
| committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-22 18:18:27 +0200 |
| commit | 41d1db2d4ab26bc87840de879e45210c9d3284a3 (patch) | |
| tree | 9c9614b665e2a878862cffc5d854fd5c6c4630e6 /webclient/nbproject | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1 (diff) | |
| parent | Use /home everywhere (diff) | |
| download | synapse-41d1db2d4ab26bc87840de879e45210c9d3284a3.tar.xz | |
Merge branch 'settings-page' into develop
Diffstat (limited to '')
| -rw-r--r-- | webclient/nbproject/licenseheader.txt | 16 | ||||
| -rw-r--r-- | webclient/nbproject/private/private.properties | 1 | ||||
| -rw-r--r-- | webclient/nbproject/private/private.xml | 22 |
3 files changed, 39 insertions, 0 deletions
diff --git a/webclient/nbproject/licenseheader.txt b/webclient/nbproject/licenseheader.txt new file mode 100644 index 0000000000..36e6dcf181 --- /dev/null +++ b/webclient/nbproject/licenseheader.txt @@ -0,0 +1,16 @@ +/* +Copyright 2014 matrix.org + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + diff --git a/webclient/nbproject/private/private.properties b/webclient/nbproject/private/private.properties new file mode 100644 index 0000000000..3b1a22e6c9 --- /dev/null +++ b/webclient/nbproject/private/private.properties @@ -0,0 +1 @@ +browser=Chrome.INTEGRATED diff --git a/webclient/nbproject/private/private.xml b/webclient/nbproject/private/private.xml new file mode 100644 index 0000000000..75bc70106a --- /dev/null +++ b/webclient/nbproject/private/private.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-private xmlns="http://www.netbeans.org/ns/project-private/1"> + <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/> + <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> + <group> + <file>file:/Users/manu/UC/matrix/github/synapse/webclient/components/matrix/matrix-service.js</file> + <file>file:/Users/manu/UC/matrix/github/synapse/webclient/app.css</file> + <file>file:/Users/manu/UC/matrix/github/synapse/webclient/components/matrix/event-handler-service.js</file> + <file>file:/Users/manu/UC/matrix/github/synapse/webclient/app-controller.js</file> + <file>file:/Users/manu/UC/matrix/github/synapse/webclient/room/room.html</file> + <file>file:/Users/manu/UC/matrix/github/synapse/webclient/login/login.html</file> + <file>file:/Users/manu/UC/matrix/github/synapse/webclient/components/matrix/event-stream-service.js</file> + <file>file:/Users/manu/UC/matrix/github/synapse/webclient/components/fileUpload/file-upload-service.js</file> + <file>file:/Users/manu/UC/matrix/github/synapse/webclient/index.html</file> + <file>file:/Users/manu/UC/matrix/github/synapse/webclient/room/room-controller.js</file> + <file>file:/Users/manu/UC/matrix/github/synapse/webclient/rooms/rooms.html</file> + <file>file:/Users/manu/UC/matrix/github/synapse/webclient/app.js</file> + <file>file:/Users/manu/UC/matrix/github/synapse/webclient/rooms/rooms-controller.js</file> + <file>file:/Users/manu/UC/matrix/github/synapse/webclient/components/fileInput/file-input-directive.js</file> + </group> + </open-files> +</project-private> |