History

resolve conflicts on merge with upstream master

Stephen Birarda committed 12 years ago

Commit 1c861fb2 parents 3fe5af1 89c2812531 files · +3536 −1950Browse files

Showing the changes to interface/src/Application.cpp (1 of 531 files). Show all

Unified · Split

interface/src/Application.cpp+6−2
@@ -1,9 +1,13 @@
11 //
22 // Application.cpp
3−// interface
3+// interface/src
44 //
55 // Created by Andrzej Kapolka on 5/10/13.
6−// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
6+// Copyright 2013 High Fidelity, Inc.
7+//
8+// Distributed under the Apache License, Version 2.0.
9+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
10+//
711
812 #ifdef WIN32
913 #include <Systime.h>

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t