History

Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus

Andrzej Kapolka committed 12 years ago

Commit f7077192 parents ef8eb00 89c2812532 files · +3548 −1956Browse files

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

Unified · Split

interface/src/Menu.cpp+5−2
@@ -1,9 +1,12 @@
1//1//
2// Menu.cpp2// Menu.cpp
3// hifi3// interface/src
4//4//
5// Created by Stephen Birarda on 8/12/13.5// Created by Stephen Birarda on 8/12/13.
6// Copyright (c) 2013 HighFidelity, 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
7//10//
8 11
9#include <cstdlib>12#include <cstdlib>