diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-08 09:13:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-08 09:13:10 +0100 |
| commit | 71ff3367cab660035c6ea38e5171841dacd461b5 (patch) | |
| tree | fa8063ccfcd59ad1b7e92e374c2ce7229948a50c /mesalib/src/glsl/loop_analysis.h | |
| parent | 49efd6bbf4c48770aea3654db1e7e90f4aa0dd06 (diff) | |
| parent | 212958ab41363d50d87470f6fb47bbcdc7a74c74 (diff) | |
| download | vcxsrv-71ff3367cab660035c6ea38e5171841dacd461b5.tar.gz vcxsrv-71ff3367cab660035c6ea38e5171841dacd461b5.tar.bz2 vcxsrv-71ff3367cab660035c6ea38e5171841dacd461b5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa git update 8 Feb 2013
Conflicts:
updategit.sh
Diffstat (limited to 'mesalib/src/glsl/loop_analysis.h')
| -rw-r--r-- | mesalib/src/glsl/loop_analysis.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/loop_analysis.h b/mesalib/src/glsl/loop_analysis.h index 05c982fc1..769d62661 100644 --- a/mesalib/src/glsl/loop_analysis.h +++ b/mesalib/src/glsl/loop_analysis.h @@ -249,7 +249,7 @@ private: void *mem_ctx; - friend class loop_analysis; + friend loop_state *analyze_loop_variables(exec_list *instructions); }; #endif /* LOOP_ANALYSIS_H */ |