diff options
| author | Tim Redfern <tim@eclectronics.org> | 2012-05-21 13:35:13 +0100 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2012-05-21 13:35:13 +0100 |
| commit | b33f1e5987a8246e9f00cf7679e4163c5758d72c (patch) | |
| tree | 464274645722cfd48f71574a7b3c0616cfa39b82 /openBTSviz_win.layout | |
| parent | bc8a2d7c904e00e4e1abe939ea48a056569bec6e (diff) | |
| parent | 02635c7127b158a2821ce1f2e9fde20407d81037 (diff) | |
Merge branch 'master' of eclectronics.org@eclectronics.org:openBTSviz
Conflicts:
src/testApp.cpp
Diffstat (limited to 'openBTSviz_win.layout')
| -rw-r--r-- | openBTSviz_win.layout | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/openBTSviz_win.layout b/openBTSviz_win.layout index 9a356ef..7cd9d4e 100644 --- a/openBTSviz_win.layout +++ b/openBTSviz_win.layout @@ -1,16 +1,13 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> <ActiveTarget name="release" /> - <File name="src\main.cpp" open="1" top="1" tabpos="3"> + <File name="src\main.cpp" open="1" top="0" tabpos="3"> <Cursor position="159" topLine="0" /> </File> - <File name="src\testApp.cpp" open="1" top="0" tabpos="1"> - <Cursor position="2019" topLine="59" /> + <File name="src\testApp.cpp" open="1" top="1" tabpos="1"> + <Cursor position="1170" topLine="23" /> </File> <File name="src\testApp.h" open="1" top="0" tabpos="2"> - <Cursor position="1218" topLine="43" /> - </File> - <File name="..\..\openFrameworks-020912\addons\ofxOpenCv\src\ofxCvColorImage.h" open="1" top="0" tabpos="4"> - <Cursor position="5047" topLine="83" /> + <Cursor position="0" topLine="0" /> </File> </CodeBlocks_layout_file> |